diff --git a/config/common.txt b/config/common.txt index 970e881..82f10f3 100644 --- a/config/common.txt +++ b/config/common.txt @@ -13,6 +13,7 @@ packaging # # Require the OpenBLAS + OpenMP flavor of linear algebra packages # +_openmp_mutex=*=*_llvm openblas=*=openmp_* libopenblas=*=openmp_* libblas=*=*openblas diff --git a/pkgs/libactpol/meta.yaml b/pkgs/libactpol/meta.yaml index d864eaa..b27974c 100644 --- a/pkgs/libactpol/meta.yaml +++ b/pkgs/libactpol/meta.yaml @@ -20,11 +20,9 @@ build: requirements: build: - {{ compiler('c') }} - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -44,6 +42,7 @@ requirements: # https://github.com/conda-forge/perl-feedstock/issues/56 - libxcrypt1 # [linux] run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/pkgs/libactpol_deps/meta.yaml b/pkgs/libactpol_deps/meta.yaml index 17f6ccf..423474b 100644 --- a/pkgs/libactpol_deps/meta.yaml +++ b/pkgs/libactpol_deps/meta.yaml @@ -21,11 +21,9 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('fortran') }} - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -37,6 +35,7 @@ requirements: - make - zziplib run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/pkgs/moby2/meta.yaml b/pkgs/moby2/meta.yaml index 3ba97a7..b900ced 100644 --- a/pkgs/moby2/meta.yaml +++ b/pkgs/moby2/meta.yaml @@ -21,11 +21,9 @@ build: requirements: build: - {{ compiler('c') }} - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -40,6 +38,7 @@ requirements: # building with a numba-compatible numpy version - numba run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/pkgs/pixell/meta.yaml b/pkgs/pixell/meta.yaml index 34eb13f..a5dd6f5 100644 --- a/pkgs/pixell/meta.yaml +++ b/pkgs/pixell/meta.yaml @@ -20,11 +20,9 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('fortran') }} - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -48,6 +46,7 @@ requirements: # https://github.com/conda-forge/perl-feedstock/issues/56 - libxcrypt1 # [linux] run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/pkgs/qpoint/meta.yaml b/pkgs/qpoint/meta.yaml index c61bc70..12c77f6 100644 --- a/pkgs/qpoint/meta.yaml +++ b/pkgs/qpoint/meta.yaml @@ -20,11 +20,9 @@ build: requirements: build: - {{ compiler('c') }} - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - python - setuptools - numpy=1.26.* diff --git a/pkgs/so3g/meta.yaml b/pkgs/so3g/meta.yaml index 796d128..b159de9 100644 --- a/pkgs/so3g/meta.yaml +++ b/pkgs/so3g/meta.yaml @@ -27,11 +27,9 @@ requirements: - {{ compiler('cxx') }} - cmake - make # [unix] - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -48,6 +46,7 @@ requirements: # building with a numba-compatible numpy version - numba run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/pkgs/toast/meta.yaml b/pkgs/toast/meta.yaml index a01b2f4..46b192b 100644 --- a/pkgs/toast/meta.yaml +++ b/pkgs/toast/meta.yaml @@ -26,11 +26,9 @@ requirements: - {{ compiler('cxx') }} - cmake - make # [unix] - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] host: - - llvm-openmp # [osx] - - libgomp # [linux] + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas @@ -42,6 +40,7 @@ requirements: - libaatm - libflac run: + - llvm-openmp # [osx or linux] - openblas * openmp_* - libopenblas * openmp_* - libblas * *openblas diff --git a/tools/bootstrap_base.sh b/tools/bootstrap_base.sh index ff5f5a4..6416672 100755 --- a/tools/bootstrap_base.sh +++ b/tools/bootstrap_base.sh @@ -26,7 +26,7 @@ bash "${inst}" -b -f -p "${base}" source "${base}/etc/profile.d/conda.sh" conda activate base conda update -n base --yes conda -conda install -n base --yes conda-libmamba-solver conda-build +conda install -n base --yes conda-libmamba-solver conda-build conda-verify conda deactivate # Create base config file