forked from spack/spack-packages
-
Notifications
You must be signed in to change notification settings - Fork 3
Updates from macOS testing #53
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mathomp4
wants to merge
11
commits into
JCSDA:spack-stack-dev
Choose a base branch
from
GMAO-SI-Team:mathomp4-updates-2026Apr16
base: spack-stack-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
2bd3608
Updates from macOS testing
mathomp4 84e3e78
Add official prrte
mathomp4 dec57a0
Add pflogger 1.18.0
mathomp4 89ba6af
Pull in mathomp4/nag-openmpi-508-conflict open mpi fix for NAG
mathomp4 db16293
Add pic_flag for nag
mathomp4 80ffccf
Fixes for NAG and HDF5
mathomp4 fc9df55
Fixes for NAG and netcdf-fortran
mathomp4 0d9f816
Fixes for NAG and esmf
mathomp4 e1c983d
Merge branch 'spack-stack-dev' into mathomp4-updates-2026Apr16
mathomp4 e667ed1
Merge branch 'spack-stack-dev' into mathomp4-updates-2026Apr16
mathomp4 e2f1386
Fix for openblas and nag on darwin
mathomp4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Updates from macOS testing
- Loading branch information
commit 2bd36084811c77aad51ab885b1ca70db8003e610
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
repos/spack_repo/builtin/packages/libiconv/loop_wchar_9eb508.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| diff --git a/lib/loop_wchar.h b/lib/loop_wchar.h | ||
| --- a/lib/loop_wchar.h | ||
| +++ b/lib/loop_wchar.h | ||
| @@ -36,7 +36,6 @@ | ||
| # include <wchar.h> | ||
| # define BUF_SIZE 64 /* assume MB_LEN_MAX <= 64 */ | ||
| /* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | ||
| - extern size_t mbrtowc (); | ||
| # ifdef mbstate_t | ||
| # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) | ||
| # define mbsinit(ps) 1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
repos/spack_repo/builtin/packages/openblas/blas_normalize_test_symbols.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/ctest/CMakeLists.txt b/ctest/CMakeLists.txt | ||
| index 4496eff82..093c83541 100644 | ||
| --- a/ctest/CMakeLists.txt | ||
| +++ b/ctest/CMakeLists.txt | ||
| @@ -5,6 +5,8 @@ if (NOT NOFORTRAN) | ||
| enable_language(Fortran) | ||
| endif() | ||
|
|
||
| +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNOCHANGE") | ||
| + | ||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DADD${BU} -DCBLAS") | ||
| if (BINARY32 AND CMAKE_C_PLATFORM_ID MATCHES "MinGW" AND CMAKE_Fortran_COMPILER_VERSION VERSION_EQUAL 14.2) | ||
| list(REMOVE_ITEM ${CMAKE_Fortran_FLAGS} -O3 -O2 -O1 -Os) |
15 changes: 15 additions & 0 deletions
15
repos/spack_repo/builtin/packages/openblas/openblas-0.3.21-0.3.26_aocc.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- a/f_check 2025-12-03 06:29:33.000000000 +0000 | ||
| +++ b/f_check 2025-12-03 06:32:11.000000000 +0000 | ||
| @@ -86,7 +86,11 @@ | ||
| vendor=CRAY | ||
| openmp='-fopenmp' | ||
| ;; | ||
| - *GNU*|*GCC*) | ||
| + *Arm\ F90*|*F90\ Flang*|*F90\ AOCC*) | ||
| + vendor=FLANG | ||
| + openmp='-fopenmp' | ||
| + ;; | ||
| + *GNU*|*GCC*) | ||
|
|
||
| v="${data#*GCC: *\) }" | ||
| v="${v%%\"*}" |
11 changes: 11 additions & 0 deletions
11
repos/spack_repo/builtin/packages/openblas/openblas-0.3.27_aocc.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/f_check 2024-04-04 20:26:04.000000000 +0000 | ||
| +++ b/f_check 2025-12-03 01:13:59.000000000 +0000 | ||
| @@ -86,7 +86,7 @@ | ||
| vendor=CRAY | ||
| openmp='-fopenmp' | ||
| ;; | ||
| - *Arm\ F90*) | ||
| + *Arm\ F90*|*F90\ Flang*|*F90\ AOCC*) | ||
| vendor=FLANG | ||
| openmp='-fopenmp' | ||
| ;; |
13 changes: 13 additions & 0 deletions
13
repos/spack_repo/builtin/packages/openblas/openblas-0.3.30-apple-LTO.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/Makefile.system b/Makefile.system | ||
| index 38646c3c6..e81ccf083 100644 | ||
| --- a/Makefile.system | ||
| +++ b/Makefile.system | ||
| @@ -436,7 +436,7 @@ ifeq (x$(XCVER), x 15) | ||
| CCOMMON_OPT += -Wl,-ld_classic | ||
| FCOMMON_OPT += -Wl,-ld_classic | ||
| endif | ||
| -ifeq (x$(XCVER), x 16) | ||
| +ifeq ($(shell [ $(XCVER) -ge 16 ] && echo yes),yes) | ||
| ifeq ($(F_COMPILER), GFORTRAN) | ||
| override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) | ||
| endif |
11 changes: 11 additions & 0 deletions
11
repos/spack_repo/builtin/packages/openblas/openblas-aocc-0.3.28-plus.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/f_check 2024-08-08 20:41:46.000000000 +0000 | ||
| +++ b/f_check 2025-12-03 01:12:10.000000000 +0000 | ||
| @@ -86,7 +86,7 @@ | ||
| vendor=CRAY | ||
| openmp='-fopenmp' | ||
| ;; | ||
| - *Arm\ F90*|*F90\ Flang*) | ||
| + *Arm\ F90*|*F90\ Flang*|*F90\ AOCC*) | ||
| vendor=FLANG | ||
| openmp='-fopenmp' | ||
| ;; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
repos/spack_repo/builtin/packages/openmpi/add_string.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/opal/mca/accelerator/rocm/accelerator_rocm_module.c b/opal/mca/accelerator/rocm/accelerator_rocm_module.c | ||
| index 8f1bb2c..5ef7f09 100644 | ||
| --- a/opal/mca/accelerator/rocm/accelerator_rocm_module.c | ||
| +++ b/opal/mca/accelerator/rocm/accelerator_rocm_module.c | ||
| @@ -13,6 +13,7 @@ | ||
| #include "opal/mca/accelerator/base/base.h" | ||
| #include "opal/constants.h" | ||
| #include "opal/util/output.h" | ||
| +#include <string.h> | ||
|
|
||
| /* Accelerator API's */ | ||
| static int mca_accelerator_rocm_check_addr(const void *addr, int *dev_id, uint64_t *flags); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.