diff options
| author | takanori-ihara <62980219+takanori-ihara@users.noreply.github.com> | 2020-06-17 22:00:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 08:00:36 -0500 |
| commit | eb5f1886b78a2b79c9fb5748addaad69c1a56591 (patch) | |
| tree | 75319133c974180c45a6e34e230fc6f161cba4ef | |
| parent | dc0dfe9220ecd16b207dea9695a64fb845666f6c (diff) | |
| download | spack-eb5f1886b78a2b79c9fb5748addaad69c1a56591.tar.gz spack-eb5f1886b78a2b79c9fb5748addaad69c1a56591.tar.bz2 spack-eb5f1886b78a2b79c9fb5748addaad69c1a56591.tar.xz spack-eb5f1886b78a2b79c9fb5748addaad69c1a56591.zip | |
py-tensorflow: Update for use with Fujitsu compiler (#17088)
* py-tensorflow: Update for use with Fujitsu compiler
* py-tensorflow: remove -march option
* fix flake8 error
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorflow/package.py | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch b/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch new file mode 100644 index 0000000000..281cd63b14 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch @@ -0,0 +1,12 @@ +diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl +index 740f24ec4a..7b8300f678 100644 +--- a/tensorflow/tensorflow.bzl ++++ b/tensorflow/tensorflow.bzl +@@ -1604,6 +1604,7 @@ def _py_wrap_cc_impl(ctx): + outputs = outputs, + mnemonic = "PythonSwig", + progress_message = "SWIGing " + src.path, ++ use_default_shell_env = True, + ) + return struct(files = depset(outputs)) + diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 3b2c0ac062..5c8a10a4a9 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -255,6 +255,10 @@ class PyTensorflow(Package, CudaPackage): # Allows 2.0.* releases to build with '--config=nogcp' patch('0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch', when='@2.0.0:2.0.1') + + # for fcc + patch('1-1_fcc_tf_patch.patch', when='@2.1.0:2.1.99%fj') + # do not import contrib.cloud if not available patch('https://github.com/tensorflow/tensorflow/commit/ed62ac8203999513dfae03498e871ea35eb60cc4.patch', sha256='c37d14622a86b164e2411ea45a04f756ac61b2044d251f19ab17733c508e5305', when='@1.14.0') @@ -635,6 +639,11 @@ class PyTensorflow(Package, CudaPackage): 'build --action_env LD_LIBRARY_PATH="' + slibs + '"', '.tf_configure.bazelrc') + filter_file('build:opt --copt=-march=native', '', + '.tf_configure.bazelrc') + filter_file('build:opt --host_copt=-march=native', '', + '.tf_configure.bazelrc') + def build(self, spec, prefix): tmp_path = env['TEST_TMPDIR'] |