diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 383aded..4a15e12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,9 +55,13 @@ jobs: source ~/conda/etc/profile.d/conda.sh && conda activate base && pyver=${{ matrix.python }} && - sed -i -e "s/python=3\.[[:digit:]]\+.*/python=${pyver}/" ./config/default/packages_conda.txt && + sed -i -E "s/python=3\.[[:digit:]]+.*/python=${pyver}/" ./config/default/packages_conda.txt && cat ./config/default/packages_conda.txt && - ./soconda.sh -e soconda -v CI + if [ ${{ matrix.os }} = "macos-latest" ]; then \ + ./soconda.sh -e soconda -v CI -c binary; \ + else \ + ./soconda.sh -e soconda -v CI -c default; \ + fi - name: Run Tests run: | @@ -66,7 +70,6 @@ jobs: export OMP_NUM_THREADS=2 && export MPI_DISABLE=1 && export CI=1 && - python3 -c 'import scipy; import toast; print(toast.__version__)' && python3 -c 'import toast.tests; toast.tests.run()' && git clone --depth=1 --single-branch --branch=master https://github.com/simonsobs/sotodlib.git && pushd sotodlib && diff --git a/config/binary/packages_pip.txt b/config/binary/packages_pip.txt index 5653739..127e11f 100644 --- a/config/binary/packages_pip.txt +++ b/config/binary/packages_pip.txt @@ -3,8 +3,7 @@ quaternionarray pysm3 # Uncomment here if installing wheel, and comment out # line in packages_local.txt -posix-ipc -toast==3.0.0a20 +toast==3.0.0a23 pysqlite3-wheels qpoint so3g diff --git a/config/binary/post_install.sh b/config/binary/post_install.sh index 5b3bcce..daa1539 100644 --- a/config/binary/post_install.sh +++ b/config/binary/post_install.sh @@ -13,3 +13,8 @@ install_module=yes install_jupyter_setup=yes # Add any other shell commands here for this system... + +# Forcibly replace the conda pyfftw package with the wheel +# until this upstream PR is merged: +# https://github.com/conda-forge/pyfftw-feedstock/pull/60 +pip install --upgrade --no-deps --force-reinstall pyfftw diff --git a/config/common.txt b/config/common.txt index a52ac17..296623c 100644 --- a/config/common.txt +++ b/config/common.txt @@ -1,5 +1,5 @@ # This is the set of conda packages that should be installed -# for all configurations. The contents of +# for all configurations. The contents of # /packages_conda.txt are then appended to this list. # These are low-level tools needed to build local packages # and parse pip dependencies with pipgrip. @@ -13,7 +13,6 @@ packaging # # Require the OpenBLAS + OpenMP flavor of linear algebra packages # -_openmp_mutex=*=*_llvm openblas=*=openmp_* libopenblas=*=openmp_* libblas=*=*openblas @@ -40,6 +39,7 @@ wcslib libaatm suitesparse tomlkit +ruamel.yaml traitlets h5py astropy @@ -65,4 +65,4 @@ pyaml tqdm ipykernel pyfftw -numdifftools \ No newline at end of file +numdifftools diff --git a/config/minimal/packages_pip.txt b/config/minimal/packages_pip.txt index 5653739..127e11f 100644 --- a/config/minimal/packages_pip.txt +++ b/config/minimal/packages_pip.txt @@ -3,8 +3,7 @@ quaternionarray pysm3 # Uncomment here if installing wheel, and comment out # line in packages_local.txt -posix-ipc -toast==3.0.0a20 +toast==3.0.0a23 pysqlite3-wheels qpoint so3g diff --git a/deploy/scron_check_tag.slurm b/deploy/scron_check_tag.slurm index 0a63e2f..afa4a03 100644 --- a/deploy/scron_check_tag.slurm +++ b/deploy/scron_check_tag.slurm @@ -1,7 +1,7 @@ # OPTION 1 # #SCRON --qos=workflow -#SCRON --account=mp107 +#SCRON --account=mp107b #SCRON --time=03:00:00 #SCRON --dependency=singleton #SCRON --name=soconda_latest_tag @@ -10,6 +10,6 @@ # OPTION 2 # #SCRON -q cron -#SCRON -A mp107 +#SCRON -A mp107b #SCRON -t 03:00:00 -#44 * * * * /global/homes/s/sobs/software/git/soconda/deploy/install_nersc_tag.sh +#44 */3 * * * /global/homes/s/sobs/software/git/soconda/deploy/install_nersc_tag.sh diff --git a/pkgs/pixell/meta.yaml b/pkgs/pixell/meta.yaml index df06f0c..a0aa11a 100644 --- a/pkgs/pixell/meta.yaml +++ b/pkgs/pixell/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "0.21.1" %} -{% set sha256 = "600db7332ecdb56c8d743618413cd458737665cda5212086718555ea427a94a7" %} +{% set version = "0.23.8" %} +{% set sha256 = "1f9f89193550892e8e90b95d7fccfaf57d47ff5e99b45854e95231eb5a919a4f" %} {% set build = 0 %} diff --git a/pkgs/so3g/meta.yaml b/pkgs/so3g/meta.yaml index a147a47..c83c850 100644 --- a/pkgs/so3g/meta.yaml +++ b/pkgs/so3g/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "0.1.10" %} -{% set sha256 = "5367cdd24ac7eff70b482ede2c32df8e1acd16e582a24e489467ec2c4760c31b" %} +{% set version = "0.1.12" %} +{% set sha256 = "7028a87fc6b4b85b1c18bc7cfbb24da90506e84c7a13186fa4d32b93855d6b41" %} {% set build = 0 %} diff --git a/pkgs/toast/meta.yaml b/pkgs/toast/meta.yaml index 5a0d663..75ba162 100644 --- a/pkgs/toast/meta.yaml +++ b/pkgs/toast/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "3.0.0a21" %} -{% set sha256 = "70f0a1ad6013e30425531586e9eb711feae5e0eb9771e3a6ce16e5ac84e27b76" %} +{% set version = "3.0.0a23" %} +{% set sha256 = "677195878815f3c089067a7b28ea0d06ddd303eb6dab014a4d1a1b0e7f9eb7dd" %} {% set build = 0 %} diff --git a/soconda.sh b/soconda.sh index 2f15249..77e6d18 100755 --- a/soconda.sh +++ b/soconda.sh @@ -147,7 +147,8 @@ if [ -z ${CONDA_PKGS_DIRS} ]; then # Standard system # Create temp direcotry mkdir -p "$scriptdir/tmpfs" - conda_tmp=$(mktemp -d --tmpdir="$scriptdir/tmpfs") + # MacOS mktemp has different arguments. This is portable. + conda_tmp=$(mktemp -d "$scriptdir/tmpfs/conda_pkgs.XXXXXX") export TMPDIR="$conda_tmp" else # Running at NERSC, use a directory in scratch @@ -164,7 +165,7 @@ python_version=$(cat "${confdir}/packages_conda.txt" | grep 'python=') # Get just the major and minor version to use when specifying the # python build variant during package build. -python_major_minor=$(echo ${python_version} | sed -e 's/python=\(3\.[[:digit:]]\+\).*/\1/') +python_major_minor=$(echo ${python_version} | sed -E 's/python=(3\.[[:digit:]]+).*/\1/') # Check if this env exists or not. # env_check would be empty if it does not exist.