Merge pull request #8 from hpc4cmb/fixes

Several package fixes
hpc4cmb · May 19, 2021 · 7248453 · 7248453
2 parents 0e5d82d + b6417a3
commit 7248453
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 7 deletions.
diff --git a/configs/cori-gcc-gpu.pkgs b/configs/cori-gcc-gpu.pkgs
@@ -64,12 +64,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/cori-gcc.pkgs b/configs/cori-gcc.pkgs
@@ -62,18 +62,22 @@ h5py
 # Install healpy
 healpy
 #
-# Install Pixell
-pixell
-#
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/cori-intel.pkgs b/configs/cori-intel.pkgs
@@ -62,18 +62,22 @@ h5py
 # Install healpy
 healpy
 #
-# Install Pixell
-pixell
-#
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/docker-py3.7-debian.pkgs b/configs/docker-py3.7-debian.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/docker-toastdeps-py37.pkgs b/configs/docker-toastdeps-py37.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/docker-ubuntu_20.04_gcc9_py38.pkgs b/configs/docker-ubuntu_20.04_gcc9_py38.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+#gmp
+#mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/linux-conda-nomkl.pkgs b/configs/linux-conda-nomkl.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/linux-conda.pkgs b/configs/linux-conda.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/linux-venv.pkgs b/configs/linux-venv.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/osx-homebrew-clang.pkgs b/configs/osx-homebrew-clang.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/osx-macports-gcc.pkgs b/configs/osx-macports-gcc.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/simons-intel.pkgs b/configs/simons-intel.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+gmp
+mpfr
+#
 # Install suitesparse
 suitesparse
 #

diff --git a/configs/ubuntu-18.04-venv.pkgs b/configs/ubuntu-18.04-venv.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+#gmp
+#mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/configs/ubuntu-20.04-venv.pkgs b/configs/ubuntu-20.04-venv.pkgs
@@ -65,12 +65,19 @@ healpy
 # Install quaternionarray
 qarray
 #
+# Install Pixell
+pixell
+#
 # Install fitsio
 fitsio
 #
 # Install aatm.  Needed for some features of atmosphere simulations.
 aatm
 #
+# GMP and MPFR are needed by SuiteSparse
+#gmp
+#mpfr
+#
 # Install suitesparse
 #suitesparse
 #

diff --git a/pkgs/gmp.sh b/pkgs/gmp.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+pkg="gmp"
+pkgopts=$@
+cleanup=""
+
+version=6.2.0
+pdir=gmp-${version}
+pfile=${pdir}.tar.xz
+src=$(eval "@TOP_DIR@/tools/fetch_check.sh" https://ftp.gnu.org/gnu/gmp/${pfile} ${pfile})
+
+if [ "x${src}" = "x" ]; then
+    echo "Failed to fetch ${pkg}" >&2
+    exit 1
+fi
+cleanup="${src}"
+
+log="../log_${pkg}"
+
+echo "Building ${pkg}..." >&2
+
+rm -rf ${pdir}
+tar xf ${src} \
+    && cd ${pdir} \
+    && cleanup="${cleanup} $(pwd)" \
+    && CC="@CC@" CFLAGS="@CFLAGS@" \
+    ./configure \
+    --enable-static \
+    --disable-shared \
+    --with-pic \
+    --prefix="@AUX_PREFIX@" > ${log} 2>&1 \
+    && make -j @MAKEJ@ >> ${log} 2>&1 \
+    && make install >> ${log} 2>&1
+
+if [ $? -ne 0 ]; then
+    echo "Failed to build ${pkg}" >&2
+    exit 1
+fi
+
+echo "Finished building ${pkg}" >&2
+echo "${cleanup}"
+exit 0
diff --git a/pkgs/mpfr.sh b/pkgs/mpfr.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+pkg="mpfr"
+pkgopts=$@
+cleanup=""
+
+version=4.1.0
+pdir=mpfr-${version}
+pfile=${pdir}.tar.xz
+src=$(eval "@TOP_DIR@/tools/fetch_check.sh"  https://www.mpfr.org/mpfr-current/${pfile} ${pfile})
+
+if [ "x${src}" = "x" ]; then
+    echo "Failed to fetch ${pkg}" >&2
+    exit 1
+fi
+cleanup="${src}"
+
+log="../log_${pkg}"
+
+echo "Building ${pkg}..." >&2
+
+rm -rf ${pdir}
+tar xf ${src} \
+    && cd ${pdir} \
+    && cleanup="${cleanup} $(pwd)" \
+    && CC="@CC@" CFLAGS="@CFLAGS@" \
+    ./configure \
+    --enable-static \
+    --disable-shared \
+    --with-pic \
+    --with-gmp="@AUX_PREFIX@" \
+    --prefix="@AUX_PREFIX@" > ${log} 2>&1 \
+    && make -j @MAKEJ@ >> ${log} 2>&1 \
+    && make install >> ${log} 2>&1
+
+if [ $? -ne 0 ]; then
+    echo "Failed to build ${pkg}" >&2
+    exit 1
+fi
+
+echo "Finished building ${pkg}" >&2
+echo "${cleanup}"
+exit 0