updated conda builds to us clang 16 on macs. Worked for Fierro, hopef…

…ully it works for others
lanl · Jul 16, 2024 · 08eaf5c · 08eaf5c
1 parent 1070641
commit 08eaf5c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 13 deletions.
diff --git a/.conda/elements/meta.yaml b/.conda/elements/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: elements

diff --git a/.conda/evpfft-dev/cpu/meta.yaml b/.conda/evpfft-dev/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft-dev

diff --git a/.conda/evpfft/cpu/meta.yaml b/.conda/evpfft/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft

diff --git a/.conda/evpfft/cuda/meta.yaml b/.conda/evpfft/cuda/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: evpfft-cuda

diff --git a/.conda/fierro-dev/cpu/meta.yaml b/.conda/fierro-dev/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-dev

diff --git a/.conda/fierro/cpu/meta.yaml b/.conda/fierro/cpu/meta.yaml
@@ -3,7 +3,8 @@
 {% set macos_compiler_version = "16" %}
 # We need the same MPI version in build + host. 
 # So we have to specify it, unfortunately
-{% set mpi_version = "4.1" %}
+# UPDATE: Not necessary right now, perhaps in the future
+#{% set mpi_version = "4.1" %}
 
 package:
   name: fierro-cpu
@@ -26,19 +27,16 @@ requirements:
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}
-      #DAN- openmpi={{ mpi_version }}
     - openmpi
   host:
     - _openmp_mutex # [linux]
     - llvm-openmp   # [osx]
-      #DAN- openmpi={{ mpi_version }}
     - fierro-trilinos-cpu
     - elements
     - openmpi
   run:
     - fierro-trilinos-cpu
     - openmpi
-      #DAN- mpi
 
 about:
   home: https://github.com/lanl/Fierro

diff --git a/.conda/heffte/cpu/meta.yaml b/.conda/heffte/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-heffte

diff --git a/.conda/heffte/cuda/meta.yaml b/.conda/heffte/cuda/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 {% set cuda_version = "12.3" %}
 
 package:

diff --git a/.conda/trilinos/cpu/meta.yaml b/.conda/trilinos/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "15.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-trilinos-cpu

diff --git a/.conda/voxelizer/meta.yaml b/.conda/voxelizer/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package: 
   name: fierro-voxelizer