diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 49937fba7..ca2b3caab 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -7,7 +7,7 @@ inputs: sdk: description: 'The version of the MESA SDK to install' required: false - default: '25.12.1' + default: '26.3.2' runs: @@ -60,28 +60,29 @@ runs: mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz key: ${{ runner.os }}-${{inputs.sdk}} - - name: Get SDK ${{ runner.os }} '25.12.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '25.12.1') && (runner.os == 'Linux') }} + - name: Get SDK ${{ runner.os }} '26.3.2' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.3.2') && (runner.os == 'Linux') }} run: | - wget -q https://zenodo.org/records/18163992/files/mesasdk-x86_64-linux-25.12.1.tar.gz + wget -q https://zenodo.org/records/19210930/files/mesasdk-x86_64-linux-26.3.2.tar.gz shell: bash - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} if: runner.os == 'Linux' run: | tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + ln -s mesasdk-${{inputs.sdk}} mesasdk shell: bash - - name: Get SDK ${{ runner.os }} '25.12.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '25.12.1') && (runner.os == 'macOS') }} + - name: Get SDK ${{ runner.os }} '26.3.2' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.3.2') && (runner.os == 'macOS') }} run: | - wget --user-agent="" -q http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-25.12.1.pkg + wget -q https://zenodo.org/records/19210744/files/mesasdk-aarch64-macos-26.3.2.pkg shell: bash - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} if: runner.os == 'macOS' run: | - sudo installer -pkg mesasdk-aarch64-macos-25.12.1.pkg -target / + sudo installer -pkg mesasdk-aarch64-macos-26.3.2.pkg -target / ln -s /Applications/mesasdk mesasdk shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46f388edf..6b7471b87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["25.12.1"] # pick 2 or 3 most recent. + sdk: ["26.3.2"] # pick 2 or 3 most recent. os: [ubuntu-latest, macos-latest] dynamic: ["yes", "no"] runs-on: ${{ matrix.os }} diff --git a/gyre/Makefile b/gyre/Makefile index fbec74fc8..4d513e8fc 100644 --- a/gyre/Makefile +++ b/gyre/Makefile @@ -8,7 +8,7 @@ ifeq ($(WITH_GYRE),yes) SRCS := SRCS_CHECK := test/src/test_gyre.f90 INTERNAL_DEPENDS_ON := forum const -EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack +EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack blas CHECK_RESULTS_GOLDEN := test/test_output CHECK_DIFF_PROG := ndiff -quiet -relerr 1.0e-6 BINTYPE := lib diff --git a/make/setup-depends.mk b/make/setup-depends.mk index e856312f3..37c6bf4f2 100644 --- a/make/setup-depends.mk +++ b/make/setup-depends.mk @@ -6,13 +6,10 @@ PKG_CONFIG_FLAGS = ifneq ($(MESASDK_ROOT),) ifeq ($(WITH_CRLIBM),yes) - PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=crmath - MESASDK_MATH_SLOT = crmath + PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath else - PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=default - MESASDK_MATH_SLOT = default + PKG_CONFIG_FLAGS += --define-variable=math_slot=default endif - export MESASDK_MATH_SLOT endif PKG_CONFIG_PATH := $(shell BUILD_DIR=$(BUILD_DIR_) $(MAKE_DIR)/gen-pkgconfig-path $(SUBDIRS)):$(PKG_CONFIG_PATH) diff --git a/mtx/Makefile b/mtx/Makefile index b6bf23a07..ec98001e6 100644 --- a/mtx/Makefile +++ b/mtx/Makefile @@ -16,7 +16,7 @@ SRCS_CHECK := test/src/test_mtx.f90 \ test/src/test_block_tridiagonal.f90 # TODO: Also contains test dependencies sadly, I should fix this at some point INTERNAL_DEPENDS_ON := const utils math -EXTERNAL_DEPENDS_ON := lapack +EXTERNAL_DEPENDS_ON := lapack blas BINTYPE := lib # Testing diff --git a/mtx/public/mtx_solve_routines.inc b/mtx/public/mtx_solve_routines.inc index a3138bfac..736220990 100644 --- a/mtx/public/mtx_solve_routines.inc +++ b/mtx/public/mtx_solve_routines.inc @@ -215,7 +215,6 @@ real(dp) :: temp integer :: i, k info = 0 - !$omp simd private(temp) do i = 1,n temp = b(i) b(i) = b(ipiv(i)) @@ -251,7 +250,6 @@ real(dp) :: temp integer :: i, k info = 0 - !$omp simd private(temp) do i = 1,n temp = b(i) b(i) = b(ipiv(i)) @@ -287,7 +285,6 @@ real(dp) :: temp integer :: i, k info = 0 - !$omp simd private(temp) do i = 1,n temp = b(i) b(i) = b(ipiv(i))