diff --git a/tensorflow-sources.file b/tensorflow-sources.file index 1856139bdfa..1347a851503 100644 --- a/tensorflow-sources.file +++ b/tensorflow-sources.file @@ -62,9 +62,10 @@ BAZEL_OPTS="$BAZEL_OPTS $(echo %{arch_build_flags} | tr ' ' '\n' | grep -v '^$' %endif BAZEL_OPTS="$BAZEL_OPTS --config=%{build_type} --cxxopt=-std=c++%{cms_cxx_standard} --host_cxxopt=-std=c++%{cms_cxx_standard} %{makeprocesses}" BAZEL_OPTS="$BAZEL_OPTS --config=noaws --config=nogcp --config=nohdfs --config=nonccl" -%if "%{enable_tf_mkldnn}" == "0" +#%if "%{enable_tf_mkldnn}" == "0" BAZEL_OPTS="$BAZEL_OPTS --define tensorflow_mkldnn_contraction_kernel=0" -%endif +#%endif +BAZEL_OPTS="$BAZEL_OPTS --config=mkl" %ifarch ppc64le BAZEL_OPTS="$BAZEL_OPTS --define=tflite_with_xnnpack=false --define tflite_kernel_use_xnnpack=false" %endif @@ -86,7 +87,7 @@ export TF_NEED_GCP=0 export TF_ENABLE_XLA=1 export TF_NEED_OPENCL=0 export TF_NEED_VERBS=0 -export TF_NEED_MKL=0 +export TF_NEED_MKL=1 export TF_NEED_MPI=0 export TF_NEED_S3=0 export TF_NEED_GDR=0 @@ -219,6 +220,7 @@ copy_headers "$PWD" tensorflow/compiler copy_headers "$PWD" tensorflow/core/profiler/internal copy_headers "$PWD" tensorflow/core/profiler/lib copy_headers "$PWD" tensorflow/core/util/tensor_bundle +cp $PWD/bazel-out/*-%{build_type}/bin/external/llvm_openmp/libiomp*.so ${libdir}/ # do not copy the protobuf headers as we use the version in cmsdist # copy_headers "$PWD/tensorflow/contrib/makefile/downloads/protobuf/src" google diff --git a/tensorflow-sources.spec b/tensorflow-sources.spec index 296a6707e2d..15d3f6268a8 100644 --- a/tensorflow-sources.spec +++ b/tensorflow-sources.spec @@ -1,5 +1,5 @@ ### RPM external tensorflow-sources 2.12.0 -%define tag 4a22f3b460370aa5b1c60579104cd103e8f0d6bb +%define tag 0ee0c43537a4a2f48a0b77822ffbdf7f67606c19 %define branch cms/v%{realversion} %define github_user cms-externals %define python_cmd python3