[128619] trunk/dports/lang
takeshi at macports.org
takeshi at macports.org
Mon Nov 24 04:36:45 PST 2014
Revision: 128619
https://trac.macports.org/changeset/128619
Author: takeshi at macports.org
Date: 2014-11-24 04:36:45 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
omnicompiler: update to 0.9, change its name from omnixmp. add support for coarray using GASNet
Modified Paths:
--------------
trunk/dports/lang/omnicompiler/Portfile
trunk/dports/lang/omnicompiler/files/patch-configure.diff
trunk/dports/lang/omnixmp/Portfile
Added Paths:
-----------
trunk/dports/lang/omnicompiler/
Removed Paths:
-------------
trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff
trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff
trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff
trunk/dports/lang/omnixmp/files/
Modified: trunk/dports/lang/omnicompiler/Portfile
===================================================================
--- trunk/dports/lang/omnixmp/Portfile 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/Portfile 2014-11-24 12:36:45 UTC (rev 128619)
@@ -4,69 +4,82 @@
PortSystem 1.0
PortGroup mpi 1.0
-name omnixmp
-version 0.6.1
-revision 1
+name omnicompiler
+version 0.9
categories lang devel parallel
maintainers takeshi openmaintainer
-description Omni OpenMP/XcalableMP Compiler
+description code transformation compilers for C, Fortran and OpenACC
license LGPL-2.1
long_description \
- Omni OpenMP/XcalableMP Compiler
-homepage http://www.hpcs.cs.tsukuba.ac.jp/omni-compiler/xcalablemp/
+ Omni compiler is a collection of programs and libraries \
+ that allow users to build code transformation compilers. \
+ Omni Compiler is to translate C and Fortran programs \
+ with XcalableMP and/or OpenACC directives into parallel code \
+ suitable for compiling with a native compiler \
+ linked with the Omni Compiler runtime library.
+homepage http://omni-compiler.org
platforms darwin
master_sites sourceforge:xcalablemp
-checksums rmd160 28d2770d1dc93338ce99a6e07730d55424d1002f \
- sha256 7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f
+checksums rmd160 94c68eeeebd65e41098c0cb7facdfba59c1e7868 \
+ sha256 1d978c918693aabf34d4bf4b4f43e3e91c09ac4bc88a69e8974715e36bcc086f
use_bzip2 yes
-mpi.choose
-mpi.setup require_fortran -clang -dragonegg -fortran
+mpi.choose cc fc
+mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
+if {[variant_isset coarray]} {
+ mpi.enforce_variant GASNet
+}
-depends_build port:apache-ant
-depends_lib port:flex \
- port:gmp \
+depends_build port:apache-ant \
+ port:bison \
+ port:flex \
+ port:coreutils
+depends_lib port:gmp \
port:libxml2
-patchfiles patch-configure.diff \
- patch-ompc_thread.c.diff \
- patch-c-expr.c.diff \
- patch-libxmpf-Makefile.in.diff
+patchfiles patch-configure.diff
+# GNU mktemp rather than BSD mktemp is assumed
+post-patch {
+ reinplace "s|mktemp|${prefix}/bin/gmktemp|" ${worksrcpath}/Makefile.in
+ foreach f {acc xmp xmpf} {
+ reinplace "s|lib64|lib|" ${worksrcpath}/Driver/etc/linker.conf.${f}.in
+ }
+}
use_parallel_build no
+set mpi [mpi_variant_name]
+set cmp [gcc_variant_name]
+if {${cmp} == ""} {
+ set cmp mp
+}
configure.args --prefix=${prefix}/lib/${name} \
+ --disable-dependency-tracking \
--disable-xmpgpu \
- --with-gmpLibDir=${prefix}/lib \
- --with-gmpIncDir=${prefix}/include \
- --with-cflag=${configure.cflags} \
- --with-cppflag="${configure.cppflags} -I${prefix}/include/libxml2 -I/usr/include -DSIMPLE_SPIN"
+ --with-cppflag=${configure.cppflags} \
+ --with-backend-cc=${prefix}/bin/mpicc-${mpi}-${cmp} \
+ --with-backend-cflag=${configure.cflags} \
+ --with-backend-fc=${prefix}/bin/mpif90-${mpi}-${cmp} \
+ --enable-mreal \
+ --with-gmp-lib=${prefix}/lib \
+ --with-gmp-include=${prefix}/include \
+ --with-libxml=${prefix}
post-patch {
- if {${build_arch} eq "x86_64"} {
- reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
- }
}
-post-destroot {
- ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin
+variant coarray description {enable support for Coarray} {
+ depends_build-append port:GASNet
+ configure.args-append --with-gasnet=${prefix} \
+ --with-gasnet-conduit=mpi
}
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
+#variant openacc description {enable support for OpenACC (requires CUDA installation at /usr/local/cuda)} {
+# configure.args-append --enable-openacc \
+# --with-gpucc=/usr/local/cuda/bin/nvcc \
+# --with-cuda=/usr/local/cuda
+#}
-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
-
-pre-configure {
- if {[mpi_variant_isset]} {
- configure.args-append --with-mpicc=${mpi.cc} \
- --with-mpif90=${mpi.fc}
- }
-}
-
notes \
${name} is installed in ${prefix}/lib/${name}.
Deleted: trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff
===================================================================
--- trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff 2014-11-24 12:36:45 UTC (rev 128619)
@@ -1,11 +0,0 @@
---- C-FrontEnd/src/c-expr.c.orig 2012-11-14 00:28:58.000000000 +0900
-+++ C-FrontEnd/src/c-expr.c 2012-12-24 16:58:57.000000000 +0900
-@@ -1310,7 +1310,7 @@
- int len = strlen(orgToken);
- char digits[len + 1];
-
-- if(orgToken[0] == '0') {
-+ if(orgToken[0] == '0' && len > 2) {
- char c = orgToken[1];
- if(c == 'x' || c == 'X' || c == 'b' || c == 'B')
- strcpy(digits, orgToken + 2); // hex, bin
Modified: trunk/dports/lang/omnicompiler/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/omnixmp/files/patch-configure.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-configure.diff 2014-11-24 12:36:45 UTC (rev 128619)
@@ -1,29 +1,11 @@
---- configure.orig 2013-07-27 16:01:41.000000000 +0900
-+++ configure 2013-07-27 16:03:56.000000000 +0900
-@@ -5097,7 +5097,7 @@
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-- gcc)
-+ *gcc* | *clang*)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
-@@ -9925,7 +9925,7 @@
- # check size of mp_limb_t
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of GNU-MP mp_limb_t" >&5
- $as_echo_n "checking size of GNU-MP mp_limb_t... " >&6; }
-- lSz=`qcCC utils/csMPlimb.c ./csMPlimb`
-+ lSz=`qcCC buildutils/csMPlimb.c ./csMPlimb`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lSz}" >&5
- $as_echo "${lSz}" >&6; }
- omniLimbT=""
-@@ -9950,7 +9950,7 @@
- # check how many mp_limb_t the GNU-MP needed for N bit precision.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many mp_limb_t needed for $omniQPrec bit precision" >&5
- $as_echo_n "checking how many mp_limb_t needed for $omniQPrec bit precision... " >&6; }
-- omniQRealPrecInLimb=`qcCC utils/cMPlb.c ./cMPlb '' $omniQPrec`
-+ omniQRealPrecInLimb=`qcCC buildutils/cMPlb.c ./cMPlb '' $omniQPrec`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $omniQRealPrecInLimb" >&5
- $as_echo "$omniQRealPrecInLimb" >&6; }
- cat >>confdefs.h <<_ACEOF
+--- configure.orig 2014-11-23 10:17:23.000000000 +0900
++++ configure 2014-11-23 18:50:34.000000000 +0900
+@@ -25150,7 +25150,7 @@
+ $as_echo "can't find ${gmpInclude}/gmp.h. exit." >&6; }
+ exit 1
+ fi
+- gmpLibs=`ls ${gmpInclude}/libgmp.* 2> /dev/null`
++ gmpLibs=`ls ${gmpLib}/libgmp.* 2> /dev/null`
+ if test "x${gmpLibs}" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find ${gmpLib}/libgmp.*. exit." >&5
+ $as_echo "can't find ${gmpLib}/libgmp.*. exit." >&6; }
Deleted: trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff
===================================================================
--- trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff 2014-11-24 12:36:45 UTC (rev 128619)
@@ -1,13 +0,0 @@
---- libxmpf/src/Makefile.in.orig 2013-07-27 16:21:43.000000000 +0900
-+++ libxmpf/src/Makefile.in 2013-07-27 16:23:40.000000000 +0900
-@@ -610,8 +610,8 @@
- @MPI_F90@ -c xmpf_main.f
-
- install-exec-local: xmpf_main.o
-- test -z $(libdir) || /bin/mkdir -p $(libdir)
-- $(INSTALL_DATA) xmpf_main.o $(libdir)
-+ test -z $(libdir) || /bin/mkdir -p $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) xmpf_main.o $(DESTDIR)$(libdir)
-
- clean-local:
- rm -f *~ *.core core core.*
Deleted: trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff
===================================================================
--- trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff 2014-11-24 12:36:45 UTC (rev 128619)
@@ -1,16 +0,0 @@
---- libompc/src/ompc_thread.c.orig 2012-11-14 00:29:29.000000000 +0900
-+++ libompc/src/ompc_thread.c 2012-12-24 21:43:40.000000000 +0900
-@@ -263,11 +263,11 @@
- */
- ompc_max_threads = ompc_num_threads;
-
--#ifdef USE_PTHREAD
-+#ifdef USE_PTHREAD_BARRIER
- pthread_barrier_init(&ompc_thd_bar, 0, ompc_num_threads);
- #endif
-
--#if defined(OMNI_OS_IRIX) && defined(USE_PTHREAD)
-+#if (defined(OMNI_OS_IRIX) || defined(OMNI_OS_DARWIN)) && defined(USE_PTHREAD)
- pthread_setconcurrency(ompc_max_threads);
- #endif /* OMNI_OS_IRIX && USE_PTHREAD */
-
Modified: trunk/dports/lang/omnixmp/Portfile
===================================================================
--- trunk/dports/lang/omnixmp/Portfile 2014-11-24 12:25:50 UTC (rev 128618)
+++ trunk/dports/lang/omnixmp/Portfile 2014-11-24 12:36:45 UTC (rev 128619)
@@ -2,71 +2,14 @@
# $Id$
PortSystem 1.0
-PortGroup mpi 1.0
+# This port can be removed after 24 November 2015
+replaced_by omnicompiler
+PortGroup obsolete 1.0
+
name omnixmp
version 0.6.1
revision 1
categories lang devel parallel
-maintainers takeshi openmaintainer
-description Omni OpenMP/XcalableMP Compiler
license LGPL-2.1
-long_description \
- Omni OpenMP/XcalableMP Compiler
homepage http://www.hpcs.cs.tsukuba.ac.jp/omni-compiler/xcalablemp/
-platforms darwin
-master_sites sourceforge:xcalablemp
-
-checksums rmd160 28d2770d1dc93338ce99a6e07730d55424d1002f \
- sha256 7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f
-use_bzip2 yes
-
-mpi.choose
-mpi.setup require_fortran -clang -dragonegg -fortran
-
-depends_build port:apache-ant
-depends_lib port:flex \
- port:gmp \
- port:libxml2
-
-patchfiles patch-configure.diff \
- patch-ompc_thread.c.diff \
- patch-c-expr.c.diff \
- patch-libxmpf-Makefile.in.diff
-
-use_parallel_build no
-
-configure.args --prefix=${prefix}/lib/${name} \
- --disable-xmpgpu \
- --with-gmpLibDir=${prefix}/lib \
- --with-gmpIncDir=${prefix}/include \
- --with-cflag=${configure.cflags} \
- --with-cppflag="${configure.cppflags} -I${prefix}/include/libxml2 -I/usr/include -DSIMPLE_SPIN"
-
-post-patch {
- if {${build_arch} eq "x86_64"} {
- reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
- }
-}
-
-post-destroot {
- ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin
-}
-
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
-
-pre-configure {
- if {[mpi_variant_isset]} {
- configure.args-append --with-mpicc=${mpi.cc} \
- --with-mpif90=${mpi.fc}
- }
-}
-
-notes \
- ${name} is installed in ${prefix}/lib/${name}.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141124/6fe888cd/attachment-0001.html>
More information about the macports-changes
mailing list