svn commit: r522059 - in head/cad/calculix-ccx: . files

[Pedro F. Giffuni]

Author: pfg
Date: Sat Jan  4 20:34:09 2020
New Revision: 522059
URL: https://svnweb.freebsd.org/changeset/ports/522059

Log:
  cad/calculix-ccx: Enable multithreading with spooles.
  
  Enabling the multithreaded version of Spooles can bring some modest, but
  significant, improvements of around 12% for 4 CPUs.
  
  Also disable (again) the Taucs slover as it is causing coredumps and
  requires more investigation.
  
  PR:	242995
  Approved by:	thierry (mentor)

Added:
  head/cad/calculix-ccx/pkg-message   (contents, props changed)
Modified:
  head/cad/calculix-ccx/Makefile
  head/cad/calculix-ccx/files/patch-Makefile
  head/cad/calculix-ccx/pkg-descr

Modified: head/cad/calculix-ccx/Makefile
==============================================================================
--- head/cad/calculix-ccx/Makefile	Sat Jan  4 20:24:19 2020	(r522058)
+++ head/cad/calculix-ccx/Makefile	Sat Jan  4 20:34:09 2020	(r522059)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ccx
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
@@ -16,9 +17,7 @@ COMMENT=	Three-Dimensional Structural Finite Element P
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
-		libmetis.so:math/metis		\
-		libspooles.so:math/spooles	\
-		libtaucs.so:math/taucs
+		libspooles.so:math/spooles
 
 USES=		blaslapack compiler:openmp fortran gmake tar:bzip2
 USE_PERL5=	build

Modified: head/cad/calculix-ccx/files/patch-Makefile
==============================================================================
--- head/cad/calculix-ccx/files/patch-Makefile	Sat Jan  4 20:24:19 2020	(r522058)
+++ head/cad/calculix-ccx/files/patch-Makefile	Sat Jan  4 20:34:09 2020	(r522059)
@@ -1,10 +1,11 @@
 --- Makefile.orig	2019-11-25 17:54:53 UTC
 +++ Makefile
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,10 @@
  
 -CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
 -FFLAGS = -Wall -O2 
-+CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DTAUCS
++CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT \
++	  -DUSE_MT=1
 +FFLAGS += -O2 
  
 -CC=cc
@@ -14,14 +15,13 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
+@@ -21,12 +22,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
  DIR=../../../SPOOLES.2.2
  
  LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
-+	-ltaucs -lmetis \
 +	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
 +	-lpthread -lm
  

Modified: head/cad/calculix-ccx/pkg-descr
==============================================================================
--- head/cad/calculix-ccx/pkg-descr	Sat Jan  4 20:24:19 2020	(r522058)
+++ head/cad/calculix-ccx/pkg-descr	Sat Jan  4 20:34:09 2020	(r522059)
@@ -10,3 +10,4 @@ Karlsson & Sorensen, Inc (HKS) and are used with kind 
 Results obtained from CalculiX are in no way connected to ABAQUS.
 
 WWW: http://www.calculix.de
+

Added: head/cad/calculix-ccx/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/calculix-ccx/pkg-message	Sat Jan  4 20:34:09 2020	(r522059)
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+Spooles: by default the single-threaded solver is used unless you set the
+CCX_NPROC_EQUATION_SOLVER environment variable with the number of
+cores you want to use.
+EOM
+}
+]