oneAPI packages: fix install for python2 (#24296)

Fix platform detection logic to work for Python 2 and 3
This commit is contained in:
Robert Cohn
2021-06-14 13:47:44 -04:00
committed by GitHub
parent 22fe56ad24
commit d993ee7972
11 changed files with 22 additions and 22 deletions

View File

@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -17,7 +17,7 @@ class IntelOneapiCcl(IntelOneApiLibraryPackage):
depends_on('intel-oneapi-mpi')
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17731/l_oneapi_ccl_p_2021.2.0.269_offline.sh',
sha256='18b7875030243295b75471e235e91e5f7b4fc15caf18c07d941a6d47fba378d7',

View File

@@ -6,7 +6,7 @@
import glob
from os import path
import subprocess
from sys import platform
import platform
from spack import *
@@ -21,7 +21,7 @@ class IntelOneapiCompilers(IntelOneApiPackage):
depends_on('patchelf', type='build')
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
sha256='5d01cbff1a574c3775510cd97ffddd27fdf56d06a6b0c89a826fb23da4336d59',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17749/l_dpcpp-cpp-compiler_p_2021.2.0.118_offline.sh',

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -16,7 +16,7 @@ class IntelOneapiDal(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onedal.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17747/l_daal_oneapi_p_2021.2.0.358_offline.sh',
sha256='cbf4e64dbd21c10179f2d1d7e8b8b0f12eeffe6921602df33276cd0ebd1f8e34',

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -16,7 +16,7 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onednn.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17751/l_onednn_p_2021.2.0.228_offline.sh',
sha256='62121a3355298211a124ff4e71c42fc172bf1061019be6c6120830a1a502aa88',

View File

@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -15,7 +15,7 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17758/l_ipp_oneapi_p_2021.2.0.233_offline.sh',
sha256='ccdfc81f77203822d80151b40ce9e8fd82bb2de85a9b132ceed12d24d3f3ff52',

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -16,7 +16,7 @@ class IntelOneapiIppcp(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17684/l_ippcp_oneapi_p_2021.2.0.231_offline.sh',
sha256='64cd5924b42f924b6a8128a8bf8e686f5dc52b98f586ffac6c2e2f1585e3aba9',

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -16,7 +16,7 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17757/l_onemkl_p_2021.2.0.296_offline.sh',
sha256='816e9df26ff331d6c0751b86ed5f7d243f9f172e76f14e83b32bf4d1d619dbae',

View File

@@ -5,7 +5,7 @@
import subprocess
from sys import platform
import platform
from spack import *
@@ -18,7 +18,7 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/mpi-library.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17729/l_mpi_oneapi_p_2021.2.0.215_offline.sh',
sha256='d0d4cdd11edaff2e7285e38f537defccff38e37a3067c02f4af43a3629ad4aa3',

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -16,7 +16,7 @@ class IntelOneapiTbb(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onetbb.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.0',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17759/l_tbb_oneapi_p_2021.2.0.357_offline.sh',
sha256='c1c3623c5bef547b30eac009e7a444611bf714c758d7472c114e9be9d5700eba',

View File

@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from sys import platform
import platform
from spack import *
@@ -15,7 +15,7 @@ class IntelOneapiVpl(IntelOneApiLibraryPackage):
homepage = 'https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html'
if platform == 'linux':
if platform.system() == 'Linux':
version('2021.2.2',
url='https://registrationcenter-download.intel.com/akdlm/irc_nas/17733/l_oneVPL_p_2021.2.2.212_offline.sh',
sha256='21106ba5cde22f3e31fd55280fbccf263508fa054030f12d5dff4a5379ef3bb7',