Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions easybuild/easyconfigs/b/Bazel/Bazel-0.16.0-GCCcore-7.3.0.eb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ toolchain = {'name': 'GCCcore', 'version': '7.3.0'}

source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s']
sources = ['%(namelower)s-%(version)s-dist.zip']
checksums = ['c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1']
patches = ['%(name)s-%(version)s_remove_define_DATE.patch']
checksums = [
'c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1', # bazel-0.16.0-dist.zip
'e2ac95693835f71518133b664747365cc1cf1cd90fffa9b585799db967b1c951', # Bazel-0.16.0_remove_define_DATE.patch
]

builddependencies = [('binutils', '2.30')]
dependencies = [('Java', '1.8.0_162', '', True)]
dependencies = [('Java', '1.8.0_172', '', True)]

moduleclass = 'devel'
189 changes: 189 additions & 0 deletions easybuild/easyconfigs/b/Bazel/Bazel-0.16.0_remove_define_DATE.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
Remove defined of __{DATE,TIMESTAMP,TIME}__
Intel groks on using these on cmd line.

Åke Sandgren, 20180810
diff -ru bazel.orig/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL bazel/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL
--- bazel.orig/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL 1980-01-01 00:00:00.000000000 +0100
+++ bazel/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL 2018-08-10 20:29:25.149401707 +0200
@@ -91,9 +91,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""

# Security hardening on by default.
# Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
diff -ru bazel.orig/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL bazel/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL
--- bazel.orig/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL 1980-01-01 00:00:00.000000000 +0100
+++ bazel/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL 2018-08-10 20:29:25.149401707 +0200
@@ -99,9 +99,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""

# Security hardening on by default.
# Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
@@ -202,9 +199,6 @@
target_system_name: "local"
unfiltered_cxx_flag: "-fno-canonical-system-headers"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
tool_path {name: "ar" path: "/usr/bin/ar" }
tool_path {name: "cpp" path: "/usr/bin/cpp" }
tool_path {name: "dwp" path: "/usr/bin/dwp" }
diff -ru bazel.orig/tools/cpp/CROSSTOOL bazel/tools/cpp/CROSSTOOL
--- bazel.orig/tools/cpp/CROSSTOOL 1980-01-01 00:00:00.000000000 +0100
+++ bazel/tools/cpp/CROSSTOOL 2018-08-10 20:29:25.153401646 +0200
@@ -141,9 +141,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""

# Security hardening on by default.
# Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
@@ -247,9 +244,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""

# Security hardening on by default.
# Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
@@ -352,9 +346,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""

# Security hardening on by default.
# Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
diff -ru bazel.orig/tools/cpp/unix_cc_configure.bzl bazel/tools/cpp/unix_cc_configure.bzl
--- bazel.orig/tools/cpp/unix_cc_configure.bzl 1980-01-01 00:00:00.000000000 +0100
+++ bazel/tools/cpp/unix_cc_configure.bzl 2018-08-10 20:31:42.415259408 +0200
@@ -303,9 +303,6 @@
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
"-Wno-builtin-macro-redefined",
- "-D__DATE__=\\\"redacted\\\"",
- "-D__TIMESTAMP__=\\\"redacted\\\"",
- "-D__TIME__=\\\"redacted\\\"",
],
"compiler_flag": [
# Security hardening requires optimization.
diff -ru bazel.orig/tools/osx/crosstool/CROSSTOOL.tpl bazel/tools/osx/crosstool/CROSSTOOL.tpl
--- bazel.orig/tools/osx/crosstool/CROSSTOOL.tpl 1980-01-01 00:00:00.000000000 +0100
+++ bazel/tools/osx/crosstool/CROSSTOOL.tpl 2018-08-10 20:30:31.184371152 +0200
@@ -153,9 +153,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
default_python_version: "python2.7"
feature {
name: "fastbuild"
@@ -1768,9 +1765,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "x86_64-apple-ios"
default_python_version: "python2.7"
@@ -3401,9 +3395,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "i386-apple-watchos"
default_python_version: "python2.7"
@@ -5037,9 +5028,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "x86_64-apple-tvos"
default_python_version: "python2.7"
@@ -6700,9 +6688,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "i386-apple-ios"
default_python_version: "python2.7"
@@ -8333,9 +8318,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "armv7-apple-ios"
default_python_version: "python2.7"
@@ -9954,9 +9936,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "armv7k-apple-watchos"
default_python_version: "python2.7"
@@ -11578,9 +11557,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "arm64-apple-tvos"
default_python_version: "python2.7"
@@ -13229,9 +13205,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
unfiltered_cxx_flag: "-target"
unfiltered_cxx_flag: "arm64-apple-ios"
default_python_version: "python2.7"
@@ -14850,9 +14823,6 @@
builtin_sysroot: ""
unfiltered_cxx_flag: "-no-canonical-prefixes"
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
- unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
- unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
supports_start_end_lib: false
default_python_version: "python2.7"
supports_interface_shared_objects: false
35 changes: 35 additions & 0 deletions easybuild/easyconfigs/c/cuDNN/cuDNN-7.1.4.18-fosscuda-2018b.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
##
# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
#
# OriginalAuthor: Stephane Thiell <[email protected]>
# Author: Ake Sandgren <[email protected]>
##
easyblock = 'Tarball'

# The full version of the library can be found using
# strings -a cuda/lib64/libcudnn_static.a | grep cudnn_version_
name = 'cuDNN'
version = '7.1.4.18'

homepage = 'https://developer.nvidia.com/cudnn'
description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
deep neural networks."""

# fosscuda 2018b uses CUDA 9.2
toolchain = {'name': 'fosscuda', 'version': '2018b'}

# Nvidia developer registration required.
# Download link: https://developer.nvidia.com/rdp/cudnn-download
# Unpack the downloaded tar file.
# Then rename as:
# v=`strings -a cuda/lib64/libcudnn_static.a | grep cudnn_version_ | cut -d_ -f3-6 | tr _ .`
# mv cudnn-9.2-linux-x64-v7.1.tgz cudnn-9.2-linux-x64-v$v.tgz
sources = ['%(namelower)s-9.2-linux-x64-v%(version)s.tgz']
checksums = ['f875340f812b942408098e4c9807cb4f8bdaea0db7c48613acece10c7c827101']

sanity_check_paths = {
'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
'dirs': ['include', 'lib64'],
}

moduleclass = 'numlib'
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name = 'TensorFlow'
version = '1.10.0'
versionsuffix = '-Python-%(pyver)s'

homepage = 'https://www.tensorflow.org/'
description = "An open-source software library for Machine Intelligence"

toolchain = {'name': 'fosscuda', 'version': '2018b'}
toolchainopts = {'usempi': True}

source_urls = ['https://github.com/tensorflow/tensorflow/archive/']
sources = ['v%(version)s.tar.gz']
patches = [
'%(name)s-%(version)s_remove-msse-hardcoding.patch',
'%(name)s-%(version)s_swig-env.patch',
'%(name)s-%(version)s_dont_expand_cuda_cudnn_path.patch',
]
checksums = [
'ee9cb98d9e0d8106f2f4ed52a38fe89399324af303e1401567e5b64a9f86744b', # v1.10.0.tar.gz
# TensorFlow-1.10.0_remove-msse-hardcoding.patch
'd7a37d6d2be6a35b262a27ad77d3c8a4746cc7b3ae8f93b979afd947821fd1a2',
'75e33fe56c8002c162c5ebede58d5528e6eb6bc54ffabfa54250a862242351b8', # TensorFlow-1.10.0_swig-env.patch
# TensorFlow-1.10.0_dont_expand_cuda_cudnn_path.patch
'a32dc8b5601e588e29464847daeccb57ce5943e79642cf237fbd8b6ff25f40c0',
]

builddependencies = [
('Bazel', '0.16.0'),
('wheel', '0.31.1', versionsuffix),
]

dependencies = [
('Python', '2.7.15'),
('cuDNN', '7.1.4.18'),
]

cuda_compute_capabilities = ['3.0', '3.2', '3.5', '3.7', '5.0', '6.0', '7.0']

moduleclass = 'lib'
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Don't expand path for cuda_toolkit and cudnn.
We want the EasyBuild created path to be used.

Åke Sandgren, 20180613
diff -ru tensorflow-1.10.0.orig/configure.py tensorflow-1.10.0/configure.py
--- tensorflow-1.10.0.orig/configure.py 2018-08-08 01:52:04.000000000 +0200
+++ tensorflow-1.10.0/configure.py 2018-08-10 20:57:52.534731034 +0200
@@ -888,8 +888,9 @@

# Result returned from "read" will be used unexpanded. That make "~"
# unusable. Going through one more level of expansion to handle that.
- cudnn_install_path = os.path.realpath(
- os.path.expanduser(cudnn_install_path))
+# Don't expand symlinks
+# cudnn_install_path = os.path.realpath(
+# os.path.expanduser(cudnn_install_path))
if is_windows() or is_cygwin():
cudnn_install_path = cygpath(cudnn_install_path)

diff -ru tensorflow-1.10.0.orig/third_party/gpus/cuda_configure.bzl tensorflow-1.10.0/third_party/gpus/cuda_configure.bzl
--- tensorflow-1.10.0.orig/third_party/gpus/cuda_configure.bzl 2018-08-08 01:52:04.000000000 +0200
+++ tensorflow-1.10.0/third_party/gpus/cuda_configure.bzl 2018-08-10 20:59:58.120767516 +0200
@@ -389,7 +389,7 @@
cuda_toolkit_path = repository_ctx.os.environ[_CUDA_TOOLKIT_PATH].strip()
if not repository_ctx.path(cuda_toolkit_path).exists:
auto_configure_fail("Cannot find cuda toolkit path.")
- return str(repository_ctx.path(cuda_toolkit_path).realpath)
+ return cuda_toolkit_path

def _cudnn_install_basedir(repository_ctx):
"""Finds the cudnn install directory."""
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
remove hardcoding of -msse4.2 since it overrules -xHost when using Intel compilers
author: Kenneth Hoste (HPC-UGent)
diff -ru tensorflow-1.10.0.orig/tensorflow/core/BUILD tensorflow-1.10.0/tensorflow/core/BUILD
--- tensorflow-1.10.0.orig/tensorflow/core/BUILD 2018-08-08 01:52:04.000000000 +0200
+++ tensorflow-1.10.0/tensorflow/core/BUILD 2018-08-10 20:56:16.900226123 +0200
@@ -2098,7 +2098,7 @@
name = "lib_hash_crc32c_accelerate_internal",
srcs = ["lib/hash/crc32c_accelerate.cc"],
# -msse4.2 enables the use of crc32c compiler builtins.
- copts = tf_copts() + if_linux_x86_64(["-msse4.2"]),
+ copts = tf_copts() + if_linux_x86_64([""]),
)

cc_library(
diff -ru tensorflow-1.10.0.orig/tensorflow/tensorflow.bzl tensorflow-1.10.0/tensorflow/tensorflow.bzl
--- tensorflow-1.10.0.orig/tensorflow/tensorflow.bzl 2018-08-08 01:52:04.000000000 +0200
+++ tensorflow-1.10.0/tensorflow/tensorflow.bzl 2018-08-10 20:56:16.900226123 +0200
@@ -219,9 +219,9 @@
+ if_mkl(["-DINTEL_MKL=1", "-DEIGEN_USE_VML"])
+ if_mkl_open_source_only(["-DDO_NOT_USE_ML"])
+ if_mkl_lnx_x64(["-fopenmp"])
- + if_android_arm(["-mfpu=neon"])
- + if_linux_x86_64(["-msse3"])
- + if_ios_x86_64(["-msse4.1"])
+ + if_android_arm([""])
+ + if_linux_x86_64([""])
+ + if_ios_x86_64([""])
+ select({
clean_dep("//tensorflow:framework_shared_object"): [],
"//conditions:default": ["-DTENSORFLOW_MONOLITHIC_BUILD"],
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
fix for SWIG existing with 'exit 1' when "SWIGing tensorflow/python/tensorflow.i"
see also https://github.com/bazelbuild/bazel/issues/4053
author: Kenneth Hoste (HPC-UGent)
diff -ru tensorflow-1.10.0.orig/tensorflow/tensorflow.bzl tensorflow-1.10.0/tensorflow/tensorflow.bzl
--- tensorflow-1.10.0.orig/tensorflow/tensorflow.bzl 2018-08-08 01:52:04.000000000 +0200
+++ tensorflow-1.10.0/tensorflow/tensorflow.bzl 2018-08-15 10:47:56.215071066 +0200
@@ -1140,6 +1140,7 @@
args += [src.path]
outputs = [ctx.outputs.cc_out, ctx.outputs.py_out]
ctx.action(
+ use_default_shell_env = True,
executable=ctx.executable._swig,
arguments=args,
inputs=list(inputs),
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
easyblock = 'PythonPackage'

name = 'wheel'
version = '0.31.1'
versionsuffix = '-Python-%(pyver)s'

homepage = 'https://pypi.python.org/pypi/wheel'
description = """A built-package format for Python."""

toolchain = {'name': 'fosscuda', 'version': '2018b'}

source_urls = [PYPI_SOURCE]
sources = [SOURCE_TAR_GZ]
checksums = ['0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c']

dependencies = [('Python', '2.7.15')]

sanity_check_paths = {
'files': ['bin/wheel'],
'dirs': ['lib/python%(pyshortver)s/site-packages'],
}

moduleclass = 'tools'