From d3746e59e5afeb25e6d3ccb032faabb280d1f819 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Mon, 2 Sep 2024 21:55:27 -0400 Subject: [PATCH 1/3] try this --- companion.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/companion.txt b/companion.txt index 769c574d315..c0343e2589b 100644 --- a/companion.txt +++ b/companion.txt @@ -18,6 +18,9 @@ https://github.com/willvousden/ptemcee/archive/master.tar.gz --extra-index-url https://download.pytorch.org/whl/cpu torch nessai>=0.11.0 + +# Needed to make sure numpy2 build works, remove when PR merged +git+https://github.com/ahnitz/pypmc@n2 snowline # useful to look at PyCBC Live with htop From 78e312c7df74409bb4439905a74f94c6246a0ee7 Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Wed, 4 Sep 2024 11:59:50 -0400 Subject: [PATCH 2/3] try this for ligo.skymap --- companion.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/companion.txt b/companion.txt index c0343e2589b..9a76e06a3e1 100644 --- a/companion.txt +++ b/companion.txt @@ -6,7 +6,9 @@ healpy # Needed for GraceDB uploads and skymap generation ligo-gracedb>=2.10.0 -ligo.skymap!=1.1.0 +#ligo.skymap!=1.1.0 +# Temporarily use fork that doesn't force numpy<2.0 incompatibilities +git+https://github.com/ahnitz/ligo.skymap@lreq # auxiliary samplers epsie>=1.0 From 0eb551848a4385b535b5c46e5452d89683a40c2c Mon Sep 17 00:00:00 2001 From: Alexander Harvey Nitz Date: Wed, 4 Sep 2024 15:41:15 -0400 Subject: [PATCH 3/3] fix venv --- companion.txt | 3 +++ tools/docker_build_dist.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/companion.txt b/companion.txt index 9a76e06a3e1..d5295032928 100644 --- a/companion.txt +++ b/companion.txt @@ -8,6 +8,8 @@ healpy ligo-gracedb>=2.10.0 #ligo.skymap!=1.1.0 # Temporarily use fork that doesn't force numpy<2.0 incompatibilities +# Remove when PR merged, or numpy > 2.0 is a hard requirement +# https://github.com/lpsinger/ligo.skymap/pull/28 git+https://github.com/ahnitz/ligo.skymap@lreq # auxiliary samplers @@ -22,6 +24,7 @@ torch nessai>=0.11.0 # Needed to make sure numpy2 build works, remove when PR merged +# https://github.com/pypmc/pypmc/pull/105/files git+https://github.com/ahnitz/pypmc@n2 snowline diff --git a/tools/docker_build_dist.sh b/tools/docker_build_dist.sh index 14d26c33f29..21f65b02aab 100755 --- a/tools/docker_build_dist.sh +++ b/tools/docker_build_dist.sh @@ -44,7 +44,7 @@ if [ "x${PYCBC_CONTAINER}" == "xpycbc_rhel_virtualenv" ]; then yum makecache yum -y install openssl-devel yum -y install python3-virtualenv - yum -y install hdf5-static libxml2-static zlib-static libstdc++-static cfitsio-static glibc-static swig fftw-static gsl-static --skip-broken + yum -y install hdf5-static libxml2-static zlib-static libstdc++-static cfitsio-static glibc-static swig fftw-static gsl-static gsl gsl-devel --skip-broken CVMFS_PATH=/cvmfs/software.igwn.org/pycbc/${ENV_OS}/virtualenv mkdir -p ${CVMFS_PATH}