diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..3699e488c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,7 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #url = https://github.com/jcsda/spack-packages + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack-packages + branch = bugfix/crtm_fix_link_instead_of_flatten diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 201956b09..db431059e 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -87,6 +87,12 @@ packages: codee: require: - '@2025.4.7' + crtm_fix: + require: + - ~link-big-endian + - +link-little-endian + - +link-netcdf + - +link-testfiles # Attention - when updating also check the various jcsda-emc-bundles env packages crtm: require: diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml index 40749709b..0763f5fc2 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml @@ -24,13 +24,13 @@ packages: c: /gpfs/neptune/spack-stack/oneapi-2025.3.0/compiler/2025.3/bin/icx cxx: /gpfs/neptune/spack-stack/oneapi-2025.3.0/compiler/2025.3/bin/icpx fortran: /gpfs/neptune/spack-stack/oneapi-2025.3.0/compiler/2025.3/bin/ifx - environment: - prepend_path: - PATH: /cm/local/apps/gcc/11.2.0/bin - CPATH: /cm/local/apps/gcc/11.2.0/include - extra_rpaths: - - /cm/local/apps/gcc/11.2.0/lib64 - - /cm/local/apps/gcc/11.2.0/lib + #environment: + # prepend_path: + # PATH: /cm/local/apps/gcc/11.2.0/bin + # CPATH: /cm/local/apps/gcc/11.2.0/include + #extra_rpaths: + #- /cm/local/apps/gcc/11.2.0/lib64 + #- /cm/local/apps/gcc/11.2.0/lib gcc: buildable: false externals: diff --git a/repos/builtin b/repos/builtin index 340a3da5d..26e64b934 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 340a3da5d2471874648e2cc7e623f8da420265db +Subproject commit 26e64b934dc5092d98a0bb9184d1a033579e73d5 diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/ufo/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/ufo/package.py index 15c20eadb..a2886aab6 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/ufo/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/ufo/package.py @@ -104,55 +104,38 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None: def check(self): skipped_tests = None with when("@1.10.0.20250821"): - skipped_tests = [ - "ufo_test_tier1_test_ufo_tropics_qc_filters", - ] - # Until issues with crtm fixed data organization are - # resolved, exclude any tests using crtm fixed data - skipped_tests += [ - "_crtm", - "ufo_test_tier1_test_ufo_atms_skylab_filters", - "ufo_test_tier1_test_ufo_amsr2_qc", - "ufo_test_tier1_test_ufo_amsua_qc", - "ufo_test_tier1_test_ufo_amsua_allsky_gfs_gsi_qc", - "ufo_test_tier1_test_ufo_amsua_allsky_gsi_qc", - "ufo_test_tier1_test_ufo_amsua_qc_clwretmw", - "ufo_test_tier1_test_ufo_amsua_qc_filters", - "ufo_test_tier1_test_ufo_amsua_qc_filters_geos", - "ufo_test_tier1_test_ufo_amsua_qc_miss_val", - "ufo_test_tier1_test_ufo_atms_qc_filters", - "ufo_test_tier1_test_ufo_atms_n20_qc_filters_geos", - "ufo_test_tier1_test_ufo_cris_qc", - "ufo_test_tier1_test_ufo_cris_qc_land", - "ufo_test_tier1_test_ufo_amsr2_qc_filters", - "ufo_test_tier1_test_ufo_gmi_skylab_filters", - "ufo_test_tier1_test_ufo_gmi_qc_filters", - "ufo_test_tier1_test_ufo_gmi_qc_filters_geos", - "ufo_test_tier1_test_ufo_mhs_qc_filters_geos", - "ufo_test_tier1_test_ufo_qc_flags_true", - "ufo_test_tier1_test_ufo_gmi_clw_ret", - "ufo_test_tier1_test_ufo_ssmis_f17_gfs_backgroundcheck_bc", - "ufo_test_tier1_test_ufo_ssmis_f17_gfs_backgroundcheck_nbc", - ] - # Additional test failures with Intel oneAPI only + skipped_tests = [] if self.spec.satisfies("%oneapi"): skipped_tests += [ "ufo_test_tier1_test_ufo_obserrorcrossvarcorr", "ufo_test_tier1_test_ufo_obserrorwithingroupcorr", "ufo_test_tier1_test_ufo_obserrordiagonal", + "ufo_test_tier1_test_ufo_gnssrobendmetoffice_qc", "ufo_test_tier1_test_ufo_gnssrobendmetoffice_qc_profile", + "ufo_test_tier1_test_ufo_gnssrobendmetoffice_obserror", "ufo_test_tier1_test_ufo_gnssrorefmetoffice_qc", "ufo_test_tier1_test_ufo_gnssrobndnbam_qc", "ufo_test_tier1_test_ufo_gnssro_obs_error", + "ufo_test_tier1_test_ufo_gnssro_super_refraction_check", "ufo_test_tier1_test_ufo_qc_modelbestfitpressure", "ufo_test_tier1_test_ufo_satwind_inversion_correction", + "ufo_test_tier1_test_ufo_amsua_allsky_gfs_gsi_qc", + "ufo_test_tier1_test_ufo_cris_qc", + "ufo_test_tier1_test_ufo_cris_qc_land", + "ufo_test_tier1_test_ufo_qc_flags_true", "ufo_test_tier1_test_ufo_function_averagetemperaturebelow", "ufo_test_tier1_test_ufo_function_assignvalueequalchannels", "ufo_test_tier1_test_ufo_fov_amsua", "ufo_test_tier1_test_ufo_sample_and_reduce_over_fov", "ufo_test_tier1_test_ufo_opr_gnssrorefmetoffice", "ufo_test_tier1_test_ufo_linopr_gnssrorefmetoffice", + "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice", + "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice", + "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice_nopseudo", + "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice_nopseudo", "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice_profile", + "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice_nosupercheck", + "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice_nosupercheck", "ufo_test_tier1_test_ufo_opr_groundgnssmetoffice", "ufo_test_tier1_test_ufo_linopr_groundgnssmetoffice", "ufo_test_tier1_test_ufo_opr_logarithm", @@ -162,15 +145,23 @@ def check(self): "ufo_test_tier1_test_ufo_opr_seaicefrac", "ufo_test_tier1_test_ufo_linopr_seaicefrac", "ufo_test_tier1_test_ufo_opr_sfcpcorrected", - "ufo_test_tier1_test_ufo_gnssrobendmetoffice_qc", - "ufo_test_tier1_test_ufo_gnssrobendmetoffice_obserror", - "ufo_test_tier1_test_ufo_gnssro_super_refraction_check", - "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice", - "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice", - "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice_nopseudo", - "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice_nopseudo", - "ufo_test_tier1_test_ufo_opr_gnssrobendmetoffice_nosupercheck", - "ufo_test_tier1_test_ufo_linopr_gnssrobendmetoffice_nosupercheck", + "ufo_test_tier1_test_ufo_opr_abi_ahi_crtm", + "ufo_test_tier1_test_ufo_linopr_abi_ahi_crtm", + "ufo_test_tier1_test_ufo_opr_airs_crtm", + "ufo_test_tier1_test_ufo_linopr_airs_crtm", + "ufo_test_tier1_test_ufo_opr_crtm_vis_albedo", + "ufo_test_tier1_test_ufo_opr_cris_crtm", + "ufo_test_tier1_test_ufo_linopr_cris_crtm", + "ufo_test_tier1_test_ufo_opr_cris_crtm_co2_options", + "ufo_test_tier1_test_ufo_linopr_cris_crtm_co2_options", + "ufo_test_tier1_test_ufo_opr_hirs4_crtm", + "ufo_test_tier1_test_ufo_linopr_hirs4_crtm", + "ufo_test_tier1_test_ufo_opr_iasi_crtm", + "ufo_test_tier1_test_ufo_opr_seviri_crtm", + "ufo_test_tier1_test_ufo_linopr_seviri_crtm", + "ufo_test_tier1_test_ufo_opr_sndrd1-4_crtm", + "ufo_test_tier1_test_ufo_linopr_sndrd1-4_crtm", + "ufo_test_tier1_test_ufo_obsdiag_crtm_airs_optics", ] ctest = Executable(self.spec["cmake"].prefix.bin.ctest) with working_dir(self.build_directory):