cleanup

hgreebe · Jun 21, 2024 · 0917d05 · 0917d05
1 parent db0ff2c
commit 0917d05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/cookbooks/aws-parallelcluster-platform/recipes/install/intel_mpi.rb b/cookbooks/aws-parallelcluster-platform/recipes/install/intel_mpi.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 intelmpi_supported = !arm_instance?
-intelmpi_version = '2021.12'
+intelmpi_version = '2021.9.0'
 
 node.default['conditions']['intel_mpi_supported'] = intelmpi_supported
 node.default['cluster']['intelmpi']['version'] = intelmpi_version
@@ -25,12 +25,12 @@
 
 return unless intelmpi_supported
 
-intelmpi_full_version = "#{intelmpi_version}.1.8"
+intelmpi_full_version = "#{intelmpi_version}.43482"
 intelmpi_installation_path = "/opt/intel/mpi/#{intelmpi_version}"
 intelmpi_installer = "l_mpi_oneapi_p_#{intelmpi_full_version}_offline.sh"
 intelmpi_installer_path = "#{node['cluster']['sources_dir']}/#{intelmpi_installer}"
 intelmpi_installer_url = "#{node['cluster']['base_build_url']}/archives/impi/#{intelmpi_installer}"
-intelmpi_qt_version = '6.5.3'
+intelmpi_qt_version = '6.4.2'
 
 # Prerequisite for module install
 modules 'Prerequisite: Environment modules'
@@ -64,12 +64,12 @@
 end
 
 modules 'append intel modules file dir to modules conf' do
-  line "#{intelmpi_installation_path}/etc/modulefiles/"
+  line "#{intelmpi_installation_path}/modulefiles/"
   action :append_to_config
 end
 
-intelmpi_modulefile_from = "#{intelmpi_installation_path}/etc/modulefiles/mpi"
-intelmpi_modulefile_to   = "#{intelmpi_installation_path}/etc/modulefiles/intelmpi"
+intelmpi_modulefile_from = "#{intelmpi_installation_path}/modulefiles/mpi"
+intelmpi_modulefile_to   = "#{intelmpi_installation_path}/modulefiles/intelmpi"
 
 execute "rename intel mpi modules file name" do
   command "mv #{intelmpi_modulefile_from} #{intelmpi_modulefile_to}"

diff --git a/cookbooks/aws-parallelcluster-platform/resources/arm_pl/partial/_arm_pl_common.rb b/cookbooks/aws-parallelcluster-platform/resources/arm_pl/partial/_arm_pl_common.rb
@@ -56,7 +56,7 @@
 
   armpl_url = %W(
     #{node['cluster']['base_build_url']}
-    armpl/#{armpl_platform}
+    archives/armpl/#{armpl_platform}
     #{armpl_tarball_name}
   ).join('/')
 

diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pmix.rb b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pmix.rb
@@ -17,8 +17,6 @@
 
 # PMIx software
 pmix_version = node['cluster']['pmix']['version']
-pmix_url = "#{node['cluster']['artifacts_s3_url']}/dependencies/pmix/pmix-#{pmix_version}.tar.gz"
-pmix_sha256 = node['cluster']['pmix']['sha256']
 pmix_tarball = "#{node['cluster']['sources_dir']}/pmix-#{pmix_version}.tar.gz"
 
 bash 'get pmix from s3' do