zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not require license for new Intel libraries (#3931)

Browse Source 
* new Intel libs do not require license to install

* updated Intel library package URLs

* disable license_required for new Intel libraries
This commit is contained in:
Gregory Lee
2017-04-23 06:58:47 -07:00
committed by Adam J. Stewart
parent b2155a5682
commit 67bf71630b
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
var/spack/repos/builtin/packages/intel/package.py
View File

@@ -56,13 +56,23 @@ class IntelInstaller(Package):
homepage = "https://software.intel.com/en-us"
intel_components = "ALL"
license_required = True
license_comment = '#'
license_files = ['Licenses/license.lic']
license_vars = ['INTEL_LICENSE_FILE']
license_url = \
'https://software.intel.com/en-us/articles/intel-license-manager-faq'
@property
def license_required(self):
# The Intel libraries are provided without requiring a license as of
# version 2017.2. Trying to specify the license will fail. See
# https://software.intel.com/en-us/articles/free-mkl
if (self.spec.satisfies("intel-mkl@2017.2:") or
self.spec.satisfies("intel-daal@2017.2:") or
self.spec.satisfies("intel-ipp@2017.2:")):
return False
return True
@property
def global_license_file(self):
"""Returns the path where a global license file should be stored."""
@@ -84,13 +94,22 @@ def install(self, spec, prefix):
CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
PSET_INSTALL_DIR=%s
NONRPM_DB_DIR=%s
CONTINUE_WITH_OPTIONAL_ERROR=yes
COMPONENTS=%s
""" % (self.intel_prefix, self.intel_prefix, self.intel_components))
# The Intel libraries are provided without requiring a license as of
# version 2017.2. Trying to specify the license will fail. See
# https://software.intel.com/en-us/articles/free-mkl
if not (spec.satisfies("intel-mkl@2017.2:") or
spec.satisfies("intel-daal@2017.2:") or
spec.satisfies("intel-ipp@2017.2:")):
with open(silent_config_filename, 'a') as f:
f.write("""
ACTIVATION_LICENSE_FILE=%s
ACTIVATION_TYPE=license_file
PHONEHOME_SEND_USAGE_DATA=no
CONTINUE_WITH_OPTIONAL_ERROR=yes
COMPONENTS=%s
""" % (self.intel_prefix, self.intel_prefix, self.global_license_file,
self.intel_components))
""" % (self.global_license_file))
install_script = Executable("./install.sh")
install_script('--silent', silent_config_filename)