Attachment 210451 Details for Bug 242995 – Disable taucs but enable multithreading

[patch] Disable taucs but enable multithreading

cad-calculix-ccx.diff (text/plain), 2.85 KB, created by Pedro F. Giffuni on 2020-01-04 19:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2020-01-04 19:25:08 UTC

Size: 2.85 KB

patch

obsolete

>Index: cad/calculix-ccx/Makefile
>===================================================================
>--- cad/calculix-ccx/Makefile	(revision 522047)
>+++ cad/calculix-ccx/Makefile	(working copy)
>@@ -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 @@
> 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
>Index: cad/calculix-ccx/files/patch-Makefile
>===================================================================
>--- cad/calculix-ccx/files/patch-Makefile	(revision 522047)
>+++ cad/calculix-ccx/files/patch-Makefile	(working copy)
>@@ -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,7 +15,7 @@
>  
>  .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 = \
>@@ -21,7 +22,6 @@
> -       $(DIR)/spooles.a \
> -	../../../ARPACK/libarpack_INTEL.a \
> -       -lpthread -lm -lc
>-+	-ltaucs -lmetis \
> +	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
> +	-lpthread -lm
>  
>Index: cad/calculix-ccx/pkg-descr
>===================================================================
>--- cad/calculix-ccx/pkg-descr	(revision 522047)
>+++ cad/calculix-ccx/pkg-descr	(working copy)
>@@ -10,3 +10,4 @@
> Results obtained from CalculiX are in no way connected to ABAQUS.
> 
> WWW: http://www.calculix.de
>+
>Index: cad/calculix-ccx/pkg-message
>===================================================================
>--- cad/calculix-ccx/pkg-message	(nonexistent)
>+++ cad/calculix-ccx/pkg-message	(working copy)
>@@ -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
>+}
>+]
>
>Property changes on: cad/calculix-ccx/pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 242995: 210340 | 210344 | 210358 | 210451