From 46eb0095f2f04164cc02dca91c5be9ed4eb2c005 Mon Sep 17 00:00:00 2001 From: Jake O'Shannessy Date: Mon, 25 Mar 2024 22:35:46 +0000 Subject: [PATCH] Account for changed modulefiles location --- fds/fds.sh | 3 ++- fds/template.spec | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fds/fds.sh b/fds/fds.sh index d985cba..bfbc7b3 100755 --- a/fds/fds.sh +++ b/fds/fds.sh @@ -90,7 +90,8 @@ elif [ "$USE_MPICH" = true ]; then else # Use Intel MPI by default. First we have to load the module files from # the OneAPI installations as they aren't loaded by default. - module use /opt/intel/oneapi/modulefiles + /opt/intel/oneapi/modulefiles-setup.sh --force + module use ~/modulefiles # Load mpi, this will now load intel mpi first module load mpi # Unlike openmpi, the intel modules don't set MPI_SUFFIX so we need to diff --git a/fds/template.spec b/fds/template.spec index d9937d2..719d552 100644 --- a/fds/template.spec +++ b/fds/template.spec @@ -1,5 +1,5 @@ -%global this_release 4 +%global this_release 5 #TODO: this isn't as clean as the openmpi version %global _intelmpi_load \ @@ -221,6 +221,8 @@ install -D %{repo}-%{commit}/%{build_dir}/%{intel_string}%{?arch_suffix}/fds%{?m %endif %changelog +* Mon Mar 25 2024 Jake O'Shannessy - %{version}-5 +- Unpin intel package versions * Sun Dec 10 2023 Jake O'Shannessy - %{version}-4 - Unpin intel package versions * Mon Jul 17 2023 Jake O'Shannessy - %{version}-3