consolidate CC CXX variables, fix unittest

Consolidate the compilers used for building Wasp and MPI. Looks like these can now diverge on conda-forge. Add additional packages to be ignored due to not having a conda version... meh, I am not familiar with the why of this, as the libraries added, are being tracked, and have a conda version. TODO: ask Logan!
idaholab · Oct 16, 2024 · a095220 · a095220
1 parent d60151a
commit a095220
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 29 deletions.
diff --git a/conda/mpi/conda_build_config.yaml b/conda/mpi/conda_build_config.yaml
@@ -25,6 +25,18 @@ zip_keys:
   - mpi_website
   - mpi_dev_website
 
+### If you change these versions, change also conda/wasp/*
+moose_cc:
+  - gcc 12.3.0 h915e2ae_7                                   # [linux]
+  - clang 16.0.6 hdae98eb_6                                 # [not arm64 and osx]
+  - clang 16.0.6 h30cc82d_6                                 # [arm64]
+
+### If you change these versions, change also conda/wasps/*
+moose_cxx:
+  - gxx 12.3.0 h915e2ae_7                                   # [linux]
+  - clangxx 16.0.6 default_h7151d67_6                       # [not arm64 and osx]
+  - clangxx 16.0.6 default_h4cf2255_6                       # [arm64]
+
 moose_gfortran:
   - gfortran 12.3.0 h915e2ae_13                             # [linux]
   - gfortran 12.3.0 h2c809b3_1                              # [not arm64 and osx]
@@ -35,26 +47,12 @@ moose_libgfortran5:
   - libgfortran5 13.2.0 h2873a65_3                          # [not arm64 and osx]
   - libgfortran5 13.2.0 hf226fd6_3                          # [arm64]
 
-moose_gcc:                                                  # [linux]
-  - gcc 12.3.0 h915e2ae_7                                   # [linux]
-
-moose_gxx:                                                  # [linux]
-  - gxx 12.3.0 h915e2ae_7                                   # [linux]
-
 moose_gcc_impl:                                             # [linux]
   - gcc_impl_linux-64 12.3.0 h58ffeeb_7                     # [linux]
 
 moose_gfortran_impl:                                        # [linux]
   - gfortran_impl_linux-64 12.3.0 h1645026_7                # [linux]
 
-moose_clangcc:                                              # [osx]
-  - clang 16.0.6 hdae98eb_6                                 # [not arm64 and osx]
-  - clang 16.0.6 h30cc82d_6                                 # [arm64]
-
-moose_clangxx:                                              # [osx]
-  - clangxx 16.0.6 default_h7151d67_6                       # [not arm64 and osx]
-  - clangxx 16.0.6 default_h4cf2255_6                       # [arm64]
-
 ### Below are pinings created at the time of render
 ### based on above content. If any of the above
 ### content changes, modification will be needed below

diff --git a/conda/mpi/meta.yaml b/conda/mpi/meta.yaml
@@ -45,8 +45,8 @@ outputs:
         - {{ moose_gfortran }}
         - {{ moose_libzlib }}
         - {{ moose_libcxx }}
-        - {{ moose_clangcc }}                     # [osx]
-        - {{ moose_clangxx }}                     # [osx]
+        - {{ moose_cc }}
+        - {{ moose_cxx }}
         - {{ moose_clang_osx }}                   # [osx]
         - {{ moose_compiler_rt }}                 # [osx]
         - {{ moose_libclang }}                    # [osx]
@@ -55,8 +55,6 @@ outputs:
         - {{ moose_llvm_openmp }}                 # [osx]
         - {{ moose_gcc_impl }}                    # [linux]
         - {{ moose_gfortran_impl }}               # [linux]
-        - {{ moose_gcc }}                         # [linux]
-        - {{ moose_gxx }}                         # [linux]
         - {{ moose_libstdcxx }}                   # [linux]
         - {{ moose_libstdcxx_devel }}             # [linux]
         - {{ moose_icu }}
@@ -70,8 +68,8 @@ outputs:
         - {{ moose_gfortran }}
         - {{ moose_libzlib }}
         - {{ moose_libcxx }}
-        - {{ moose_clangcc }}                     # [osx]
-        - {{ moose_clangxx }}                     # [osx]
+        - {{ moose_cc }}
+        - {{ moose_cxx }}
         - {{ moose_clang_osx }}                   # [osx]
         - {{ moose_compiler_rt }}                 # [osx]
         - {{ moose_libclang }}                    # [osx]
@@ -80,8 +78,6 @@ outputs:
         - {{ moose_llvm_openmp }}                 # [osx]
         - {{ moose_gcc_impl }}                    # [linux]
         - {{ moose_gfortran_impl }}               # [linux]
-        - {{ moose_gcc }}                         # [linux]
-        - {{ moose_gxx }}                         # [linux]
         - {{ moose_libstdcxx }}                   # [linux]
         - {{ moose_libstdcxx_devel }}             # [linux]
         - {{ moose_icu }}

diff --git a/conda/wasp/conda_build_config.yaml b/conda/wasp/conda_build_config.yaml
@@ -4,6 +4,18 @@ moose_python:
   - python 3.10
   - python 3.9
 
+### If you change these versions, change also conda/mpi/*
+moose_cc:
+  - gcc 12.3.0 h915e2ae_7                                   # [linux]
+  - clang 16.0.6 hdae98eb_6                                 # [not arm64 and osx]
+  - clang 16.0.6 h30cc82d_6                                 # [arm64]
+
+### If you change these versions, change also conda/mpi/*
+moose_cxx:
+  - gxx 12.3.0 h915e2ae_7                                   # [linux]
+  - clangxx 16.0.6 default_h7151d67_6                       # [not arm64 and osx]
+  - clangxx 16.0.6 default_h4cf2255_6                       # [arm64]
+
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]
   - /opt/MacOSX11.3.sdk                                     # [osx]

diff --git a/conda/wasp/meta.yaml b/conda/wasp/meta.yaml
@@ -45,11 +45,11 @@ outputs:
         - {{ pin_subpackage('moose-wasp-base', max_pin='x.x')}}
     requirements:
       build:
-      - {{ compiler('c') }}
-      - {{ compiler('cxx') }}
-      - make
-      - cmake
-      - pkg-config
+        - {{ moose_cc }}
+        - {{ moose_cxx }}
+        - make
+        - cmake
+        - pkg-config
 
   - name: moose-pyhit
     build:

diff --git a/python/MooseDocs/test/extensions/test_versioner.py b/python/MooseDocs/test/extensions/test_versioner.py
@@ -59,8 +59,14 @@ def testCondaVersionRender(self):
     def testCodeRender(self):
         """Test inline replacement within code blocks"""
         for package in versioner.TRACKING_LIBRARIES:
-            # Application doesn't have a conda version
-            has_conda_version = package != 'app'
+            # Application, doesn't have a conda version
+            # Several support libraries also have no conda version
+            has_conda_version = package not in ['app',
+                                                'libmesh-vtk',
+                                                'peacock',
+                                                'pprof',
+                                                'pyhit',
+                                                'seacas']
 
             # Change something like "moose-dev" -> "MOOSE_DEV"
             package_inline = package.upper().replace('-', '_')

diff --git a/scripts/versioner.py b/scripts/versioner.py
@@ -30,6 +30,8 @@
 
 ### Tracking Libraries
 # note: Order is important only for historical lookups; git_ancestor(commit) == True
+# note: If adding to this list, see line 64 in
+# python/MooseDocs/test/extensions/test_versioner.py
 TRACKING_LIBRARIES = ['libmesh-vtk',
                       'peacock',
                       'pprof',