Skip to content

GitLab

Commit daa81d65 authored by Dmitri Konstantinov's avatar Dmitri Konstantinov
Browse files

Merge branch 'SPI-2004_protobuf_and_boto3' into 'master' 

[SPI-2004]: Update protobuf and create hadoop binary distribution without native code

See merge request !983
parents 48c0a2c6 abf3006c
Pipeline #3201054 passed with stage
in 53 seconds
Hide whitespace changes
Inline Side-by-side
cmake/toolchain/heptools-dev-base.cmake
View file @ daa81d65
......@@ -59,6 +59,8 @@ LCG_external_package(bzip2 1.0.6
LCG_external_package(bokeh 2.3.1 )
LCG_external_package(Boost 1.77.0 )
LCG_external_package(boost_histogram 1.2.1 )
LCG_external_package(boto3 1.18.37 )
LCG_external_package(botocore 1.21.37 )
LCG_external_package(caniusepython3 7.1.0 )
LCG_external_package(C50 2.07 )
LCG_external_package(cachetools 3.1.1 )
......@@ -197,9 +199,6 @@ LCG_external_package(gtest 1.10.0
if((${LCG_OS} MATCHES centos|ubuntu) AND (NOT ${LCG_COMP} STREQUAL clang))
LCG_external_package(hadoop 3.3.0 )
LCG_external_package(hadoop_xrootd 1.0.7 )
elseif(NOT ${LCG_OS}${LCG_OSVERS} MATCHES mac[0-9]+)
LCG_external_package(hadoop 2.7.5.1 )
LCG_external_package(hadoop_xrootd 1.0.4 )
endif()
LCG_external_package(harfbuzz 1.9.0 )
LCG_external_package(hbase 1.2.0 )
......@@ -259,6 +258,7 @@ LCG_external_package(jaxlib 0.1.59
LCG_external_package(jedi 0.18.0 )
LCG_external_package(jemalloc 5.2.1 )
LCG_external_package(Jinja2 3.0.1 )
LCG_external_package(jmespath 0.10.0 )
LCG_external_package(joblib 1.0.1 )
LCG_external_package(jpeg v6b )
LCG_external_package(jsonc 0.12 )
......@@ -448,7 +448,7 @@ LCG_external_package(prettytable 0.7.2
LCG_external_package(proj 8.0.0 )
LCG_external_package(prometheus_client 0.11.0 )
LCG_external_package(prompt_toolkit 3.0.19 )
LCG_external_package(protobuf 2.5.0 )
LCG_external_package(protobuf 3.18.1 )
LCG_external_package(psutil 5.8.0 )
LCG_external_package(ptyprocess 0.7.0 )
LCG_external_package(py 1.9.0 )
......@@ -535,6 +535,7 @@ LCG_external_package(rise 5.5.0
# LCG_external_package(rpy2 3.0.4 )
LCG_external_package(rsa 4.0 )
LCG_external_package(ruamel_yaml 0.17.16 )
LCG_external_package(s3transfer 0.5.0 )
LCG_external_package(scandir 1.10.0 )
LCG_external_package(scikitimage 0.14.3 )
LCG_external_package(scikitlearn 0.24.2 )
......@@ -558,7 +559,7 @@ LCG_external_package(snowballstemmer 2.1.0
LCG_external_package(sollya 7.0 )
#LCG_external_package(soqt 1.5.0 )
LCG_external_package(sortedcontainers 2.1.0 )
if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos OR ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu)
if((${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos OR ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu) AND (NOT ${LCG_COMP} STREQUAL clang))
LCG_external_package(spark 3.2.0-cern1 )
endif()
LCG_external_package(spdlog 1.5.0 )
......
externals/CMakeLists.txt
View file @ daa81d65
......@@ -2239,7 +2239,11 @@ LCGPackage_Add(
#----protobuf-------------------------------------------------------------------
LCGPackage_Add(
protobuf
URL ${GenURL}/protobuf-${protobuf_native_version}.tar.gz
IF <VERSION> VERSION_EQUAL 3.18.1 OR <VERSION> VERSION_EQUAL 3.7.1 THEN
URL ${GenURL}/protobuf-all-${protobuf_native_version}.tar.gz
ELSE
URL ${GenURL}/protobuf-${protobuf_native_version}.tar.gz
ENDIF
IF <VERSION> VERSION_GREATER 3.0.0 THEN
CONFIGURE_COMMAND ./autogen.sh
COMMAND ./configure --prefix=<INSTALL_DIR>
......@@ -3016,7 +3020,7 @@ LCGPackage_Add(
ENDIF
BUILD_IN_SOURCE 1
DEPENDS maven protobuf
IF <VERSION> VERSION_GREATER 3.0.0 THEN protobuf snappy zstandard zlib ENDIF
IF <VERSION> VERSION_GREATER 3.0.0 THEN protobuf snappy zstandard zlib ENDIF
)
#---hadoop-xrootd---------------------------------------------------------------
......
pyexternals/CMakeLists.txt
View file @ daa81d65
......@@ -5445,3 +5445,56 @@ LCGPackage_Add(
torch_scatter torch_sparse
)
# Addional dependencies? 'rdflib', 'googledrivedownloader', 'yacs'
#---jmespath--------------------------------------------------------------------------
LCGPackage_Add(
jmespath
URL ${GenURL}/jmespath-${jmespath_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND rm -rf BUILD
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
)
#---botocore--------------------------------------------------------------------------
LCGPackage_Add(
botocore
URL ${GenURL}/botocore-${botocore_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools jmespath python_dateutil urllib3
)
#---s3transfer------------------------------------------------------------------------
LCGPackage_Add(
s3transfer
URL ${GenURL}/s3transfer-${s3transfer_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools botocore
)
#---boto3-----------------------------------------------------------------------------
LCGPackage_Add(
boto3
URL ${GenURL}/boto3-${boto3_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools botocore jmespath s3transfer
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment