From b1a93003c4ef1653ee717a2d626e0c6765ea823b Mon Sep 17 00:00:00 2001 From: Pere Mato <pere.mato@cern.ch> Date: Tue, 28 Apr 2020 15:57:07 +0200 Subject: [PATCH] opt_einsum version dependent of Python version --- cmake/toolchain/heptools-dev-base.cmake | 3 ++- pyexternals/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 57b6b0365b..3bdc7520d2 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -52,6 +52,7 @@ if(LCG_PYTHON_VERSION EQUAL 3) LCG_external_package(numpy 1.18.2 ) LCG_external_package(llvmlite 0.32.0 ) LCG_external_package(numba 0.49.0 ) + LCG_external_package(opt_einsum 3.2.0 ) else() LCG_external_package(typing 3.6.6 ) LCG_external_package(prompt_toolkit 1.0.16 ) @@ -97,6 +98,7 @@ else() LCG_external_package(numpy 1.16.4 ) LCG_external_package(llvmlite 0.29.0 ) LCG_external_package(numba 0.44.0 ) + LCG_external_package(opt_einsum 2.3.2 ) endif() # Application Area Projects @@ -384,7 +386,6 @@ LCG_external_package(openmpi 3.1.0 if(${LCG_OS} MATCHES mac) LCG_external_package(openssl 1.1.1 ) endif() -LCG_external_package(opt_einsum 3.2.0 ) if(NOT ${LCG_OS} STREQUAL mac) if(${LCG_OS} STREQUAL centos) LCG_external_package(oracle 19.3.0.0.0 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index edc7e8e3cc..e7090d2fee 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -3212,6 +3212,7 @@ if(DEFINED cuda_native_version) set(packsuffix _gpu) set(libtype gpu) else() + set(packsuffix _cpu) set(libtype cpu) endif() -- GitLab