Make toastdeps dockerfiles their own file rather than symlink. Bump c…

…onviqt version. Remove scipy pinning to 1.6 at NERSC now that we are using conda-forge.

configs/cori-gcc

@@ -12,7 +12,7 @@ PYVERSION = 3.9
 PIP_PKGS =
 
 # Packages to install with conda
-CONDA_PKGS = future nose cython numpy scipy=1.6 matplotlib pyyaml astropy six psutil ephem virtualenv pandas memory_profiler ipython cycler kiwisolver python-dateutil toml numba tbb nbstripout black wurlitzer ipympl ipykernel jupyterlab pillow pshmem tomlkit traitlets
+CONDA_PKGS = future nose cython numpy scipy matplotlib pyyaml astropy six psutil ephem virtualenv pandas memory_profiler ipython cycler kiwisolver python-dateutil toml numba tbb nbstripout black wurlitzer ipympl ipykernel jupyterlab pillow pshmem tomlkit traitlets
 
 # Serial compilers
 

configs/cori-intel

@@ -12,7 +12,7 @@ PYVERSION = 3.9
 PIP_PKGS =
 
 # Packages to install with conda
-CONDA_PKGS = future nose cython numpy scipy=1.6 matplotlib pyyaml astropy six psutil ephem virtualenv pandas memory_profiler ipython cycler kiwisolver python-dateutil toml numba tbb nbstripout black wurlitzer ipympl ipykernel jupyterlab pillow pshmem tomlkit traitlets
+CONDA_PKGS = future nose cython numpy scipy matplotlib pyyaml astropy six psutil ephem virtualenv pandas memory_profiler ipython cycler kiwisolver python-dateutil toml numba tbb nbstripout black wurlitzer ipympl ipykernel jupyterlab pillow pshmem tomlkit traitlets
 
 # Serial compilers
 

configs/docker-toastdeps-py37

@@ -0,0 +1,77 @@
+
+# OS type (linux OR osx)
+OSTYPE = linux
+
+# Specify the template to use
+TEMPLATE = docker-debian
+
+# Python version
+PYVERSION = 3.7
+
+# Specify the docker base image
+DOCKER_BASE = python:3.7-slim-bullseye
+
+# Specify additional packages to install for docker builds
+DOCKER_SYS_PKGS = m4 libtool autoconf automake llvm libsuitesparse-dev libcfitsio-dev libflac-dev zlib1g-dev libbz2-dev libopenblas-dev liblapack-dev libhdf5-dev libboost-all-dev
+
+# Packages to install with pip
+PIP_PKGS = setuptools future six Cython cycler kiwisolver pyparsing python-dateutil toml pkgconfig pytz psutil==5.7.0 numpy==1.18.4 scipy==1.4.1 matplotlib==3.2.1 pandas==1.0.3 memory_profiler==0.57.0 astropy==4.0.1.post1 ephem==3.7.7.1 ipython==7.14.0 numba==0.49.1 tbb cmake sphinx sphinx-rtd-theme pshmem tomlkit traitlets
+
+# Packages to install with conda
+CONDA_PKGS =
+
+# Serial compilers
+
+CC = gcc
+CXX = g++
+FC = gfortran
+
+# Compiler to use for packages needed on the build machine
+
+BUILD_CC = gcc
+BUILD_CXX = g++
+
+# MPI compilers
+
+MPICC = mpicc
+MPICXX = mpicxx
+MPIFC = mpifort
+MPI_CPPFLAGS = @AUX_PREFIX@/include
+MPI_LDFLAGS = @AUX_PREFIX@/lib
+MPI_CXXLIB = mpichcxx
+MPI_LIB = mpich
+MPI_EXTRA_COMP =
+MPI_EXTRA_LINK =
+
+# Compile flags
+
+CFLAGS = -O3 -fPIC -pthread
+CXXFLAGS = -O3 -fPIC -pthread -std=c++11
+FCFLAGS = -O3 -fPIC -pthread -fallow-argument-mismatch
+
+OPENMP_CFLAGS = -fopenmp
+OPENMP_CXXFLAGS = -fopenmp
+LDFLAGS = -lpthread -fopenmp
+
+# Are we doing a cross-compile?
+CROSS =
+
+# Parallel builds
+MAKEJ = 1
+
+# Define MKL location
+MKL =
+
+# For BLAS/LAPACK, we use openblas
+
+BLAS = -lopenblas -fopenmp -lm
+LAPACK =
+
+# Boost toolchain name
+
+BOOSTCHAIN = gcc
+
+# Group and permissions to set
+
+CHGRP =
+CHMOD =

configs/docker-toastdeps-py37.pkgs

@@ -97,7 +97,7 @@ madam:--with-cfitsio=/usr --with-fftw=/usr
 #libflac
 #
 # Install SPT3G.  Frame based data format.
-#spt3g:boost=/usr/local flaclib=/usr/lib/x86_64-linux-gnu/libFLAC.so
+spt3g:flaclib=/usr/lib/x86_64-linux-gnu/libFLAC.so
 #
 # Install uncrustify
 uncrustify

configs/docker-toastdeps-py38

@@ -0,0 +1,77 @@
+
+# OS type (linux OR osx)
+OSTYPE = linux
+
+# Specify the template to use
+TEMPLATE = docker-debian
+
+# Python version
+PYVERSION = 3.8
+
+# Specify the docker base image
+DOCKER_BASE = python:3.8-slim-bullseye
+
+# Specify additional packages to install for docker builds
+DOCKER_SYS_PKGS = m4 libtool autoconf automake llvm libsuitesparse-dev libcfitsio-dev libflac-dev zlib1g-dev libbz2-dev libopenblas-dev liblapack-dev libhdf5-dev libboost-all-dev
+
+# Packages to install with pip
+PIP_PKGS = setuptools future six Cython cycler kiwisolver pyparsing python-dateutil toml pkgconfig pytz psutil==5.7.0 numpy==1.18.4 scipy==1.4.1 matplotlib==3.2.1 pandas==1.0.3 memory_profiler==0.57.0 astropy==4.0.1.post1 ephem==3.7.7.1 ipython==7.14.0 numba==0.49.1 tbb cmake sphinx sphinx-rtd-theme pshmem tomlkit traitlets
+
+# Packages to install with conda
+CONDA_PKGS =
+
+# Serial compilers
+
+CC = gcc
+CXX = g++
+FC = gfortran
+
+# Compiler to use for packages needed on the build machine
+
+BUILD_CC = gcc
+BUILD_CXX = g++
+
+# MPI compilers
+
+MPICC = mpicc
+MPICXX = mpicxx
+MPIFC = mpifort
+MPI_CPPFLAGS = @AUX_PREFIX@/include
+MPI_LDFLAGS = @AUX_PREFIX@/lib
+MPI_CXXLIB = mpichcxx
+MPI_LIB = mpich
+MPI_EXTRA_COMP =
+MPI_EXTRA_LINK =
+
+# Compile flags
+
+CFLAGS = -O3 -fPIC -pthread
+CXXFLAGS = -O3 -fPIC -pthread -std=c++11
+FCFLAGS = -O3 -fPIC -pthread -fallow-argument-mismatch
+
+OPENMP_CFLAGS = -fopenmp
+OPENMP_CXXFLAGS = -fopenmp
+LDFLAGS = -lpthread -fopenmp
+
+# Are we doing a cross-compile?
+CROSS =
+
+# Parallel builds
+MAKEJ = 1
+
+# Define MKL location
+MKL =
+
+# For BLAS/LAPACK, we use openblas
+
+BLAS = -lopenblas -fopenmp -lm
+LAPACK =
+
+# Boost toolchain name
+
+BOOSTCHAIN = gcc
+
+# Group and permissions to set
+
+CHGRP =
+CHMOD =

configs/docker-toastdeps-py39

@@ -0,0 +1,77 @@
+
+# OS type (linux OR osx)
+OSTYPE = linux
+
+# Specify the template to use
+TEMPLATE = docker-debian
+
+# Python version
+PYVERSION = 3.9
+
+# Specify the docker base image
+DOCKER_BASE = python:3.9-slim-bullseye
+
+# Specify additional packages to install for docker builds
+DOCKER_SYS_PKGS = m4 libtool autoconf automake llvm libsuitesparse-dev libcfitsio-dev libflac-dev zlib1g-dev libbz2-dev libopenblas-dev liblapack-dev libhdf5-dev libboost-all-dev
+
+# Packages to install with pip
+PIP_PKGS = setuptools future six Cython cycler kiwisolver pyparsing python-dateutil toml pkgconfig pytz psutil numpy scipy matplotlib pandas memory_profiler astropy ephem ipython numba tbb cmake sphinx sphinx-rtd-theme pshmem tomlkit traitlets
+
+# Packages to install with conda
+CONDA_PKGS =
+
+# Serial compilers
+
+CC = gcc
+CXX = g++
+FC = gfortran
+
+# Compiler to use for packages needed on the build machine
+
+BUILD_CC = gcc
+BUILD_CXX = g++
+
+# MPI compilers
+
+MPICC = mpicc
+MPICXX = mpicxx
+MPIFC = mpifort
+MPI_CPPFLAGS = @AUX_PREFIX@/include
+MPI_LDFLAGS = @AUX_PREFIX@/lib
+MPI_CXXLIB = mpichcxx
+MPI_LIB = mpich
+MPI_EXTRA_COMP =
+MPI_EXTRA_LINK =
+
+# Compile flags
+
+CFLAGS = -O3 -fPIC -pthread
+CXXFLAGS = -O3 -fPIC -pthread -std=c++11
+FCFLAGS = -O3 -fPIC -pthread -fallow-argument-mismatch
+
+OPENMP_CFLAGS = -fopenmp
+OPENMP_CXXFLAGS = -fopenmp
+LDFLAGS = -lpthread -fopenmp
+
+# Are we doing a cross-compile?
+CROSS =
+
+# Parallel builds
+MAKEJ = 1
+
+# Define MKL location
+MKL =
+
+# For BLAS/LAPACK, we use openblas
+
+BLAS = -lopenblas -fopenmp -lm
+LAPACK =
+
+# Boost toolchain name
+
+BOOSTCHAIN = gcc
+
+# Group and permissions to set
+
+CHGRP =
+CHMOD =

pkgs/conviqt.sh

@@ -4,7 +4,7 @@ pkg="conviqt"
 pkgopts=$@
 cleanup=""
 
-version=1.2.5
+version=1.2.6
 pfile=libconviqt-${version}.tar.gz
 src=$(eval "@TOP_DIR@/tools/fetch_check.sh" https://github.com/hpc4cmb/libconviqt/archive/v${version}.tar.gz ${pfile})