Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nlanggut/lcgcmake
  • ndiederi/lcgcmake
  • jcarcell/lcgcmake
  • tehmann/lcgcmake-parallel-publishing
  • agheata/lcgcmake
  • lprimomo/lcgcmake
  • heli/lcgcmake
  • ewelina/lcgcmake
  • dkonst/lcgcmake
  • sailer/lcgcmake
  • adye/lcgcmake
  • razumov/lcgcmake
  • jiling/lcgcmake
  • ganis/lcgcmake
  • mato/lcgcmake
  • lhcb-core/lcgcmake
  • dguest/lcgcmake
  • lforthom/lcgcmake
  • efe/lcgcmake
  • dasalama/lcgcmake
  • valassi/lcgcmake
  • bcouturi/lcgcmake
  • vavolkl/lcgcmake
  • graemes/lcgcmake
  • GENSER/lcgcmake
  • jwsmith/lcgcmake
  • hegner/lcgcmake
  • clemenci/lcgcmake
  • sft/lcgcmake
29 results
Show changes
Commits on Source (292)
Showing
with 2135 additions and 75 deletions
......@@ -58,6 +58,7 @@ alma9:
- devship
- devswan
- devAdePT
- dev3python312
ubuntu:
<<: *retry_policy
......
......@@ -9,8 +9,11 @@ LCG_remove_package(Garfield++)
#---Overwrites and additional packages ----------------------------
LCG_external_package(TensorRT 10.0.1.6 cuda=12.4 ) ## cuda name just indicative of highest supported version, this is 12.3 compatible
LCG_external_package(cuda 12.3 full=12.3.2_545.23.08 )
LCG_external_package(cudnn 8.9.7.29 cuda=12 )
LCG_external_package(cuda 12.5 full=12.5.0_555.42.02 )
# cccl is needed for cuda 12.5 and cuda 12.6.1 at least for building xgboost
LCG_external_package(cccl 2.7.0 )
LCG_external_package(cudnn 9.3.0.75 cuda=12 )
LCG_external_package(cupy 13.0.0 cuda=12x )
LCG_external_package(fastrlock 0.8.2 )
LCG_external_package(llvmmin 17.0.6 )
......@@ -19,8 +22,8 @@ LCG_external_package(py_tools 2021.2.7 )
LCG_external_package(pycuda 2024.1 )
LCG_external_package(pyopencl 2024.1 )
LCG_external_package(tvm 0.16.0 )
LCG_external_package(jax_cuda12_pjrt 0.4.28 )
LCG_external_package(jax_cuda12_plugin 0.4.28 )
LCG_external_package(jax_cuda12_pjrt 0.5.0 )
LCG_external_package(jax_cuda12_plugin 0.5.0 )
#----Overwites for Ubuntu20---------------------------------------
......
......@@ -17,5 +17,6 @@ LCG_external_package(cuda 11.8 full=11.8.0_520.61.05
LCG_external_package(cuda 12.1 full=12.1.0_530.30.02 )
LCG_external_package(cuda 12.4 full=12.4.0_550.54.14 )
LCG_external_package(cuda 12.3 full=12.3.2_545.23.08 )
LCG_external_package(cuda 12.5 full=12.5.0_555.42.02 )
LCG_external_package(java 17.0.13p11 )
......@@ -54,7 +54,7 @@ LCG_external_package(assimp 5.0.1
LCG_external_package(asn1crypto 0.24.0 )
LCG_external_package(asteval 0.9.31 )
LCG_external_package(astor 0.8.1 )
LCG_external_package(astroid 3.2.4 )
LCG_external_package(astroid 3.3.8 )
LCG_external_package(astropy 5.3.4 )
LCG_external_package(astunparse 1.6.3 )
LCG_external_package(async_generator 1.10 )
......@@ -89,9 +89,7 @@ LCG_external_package(blosc2 2.5.1
LCG_external_package(bokeh 3.1.1 )
LCG_external_package(brotli 1.0.7 )
LCG_external_package(bzip2 1.0.6 )
# boost 1.79 does not compile with gcc 8.3, see SPI-2140
message(STATUS "LCG_COMP= ${LCG_COMP} ; LCG_COMPVERS= ${LCG_COMPVERS}")
LCG_external_package(Boost 1.86.0 )
LCG_external_package(Boost 1.87.0 )
LCG_external_package(boost_histogram 1.3.2 )
LCG_external_package(boto3 1.35.48 )
LCG_external_package(botocore 1.35.48 )
......@@ -123,7 +121,7 @@ LCG_external_package(cloudpickle 3.0.0
LCG_external_package(CMake 3.30.6 )
LCG_external_package(cmaketools 1.9 )
LCG_external_package(cma 3.3.0 )
LCG_external_package(coffea 2024.11.0 )
LCG_external_package(coffea 2025.1.0 )
LCG_external_package(coin3d 3.1.3p2 )
LCG_external_package(colorama 0.4.6 )
LCG_external_package(colorcet 2.0.2 )
......@@ -358,8 +356,8 @@ if(LCG_COMP STREQUAL "clang")
endif()
LCG_external_package(jacobi 0.9.2 )
LCG_external_package(java 8u392 )
LCG_external_package(jax 0.4.28 )
LCG_external_package(jaxlib 0.4.28 )
LCG_external_package(jax 0.5.0 )
LCG_external_package(jaxlib 0.5.0 )
LCG_external_package(jedi 0.19.1 )
LCG_external_package(jemalloc 5.3.0 )
LCG_external_package(Jinja2 3.1.2 )
......@@ -407,6 +405,7 @@ LCG_external_package(langchain_core 0.2.35
LCG_external_package(langchain_text_splitters 0.2.2 )
LCG_external_package(langchain 0.2.14 )
LCG_external_package(langsmith 0.1.104 )
LCG_external_package(lap 0.5.12 )
LCG_external_package(lark 1.1.5 )
LCG_external_package(lazy_loader 0.2 )
LCG_external_package(lazy_object_proxy 1.9.0 )
......@@ -440,6 +439,7 @@ LCG_external_package(locket 1.0.0
LCG_external_package(log4cpp 1.1.4 )
LCG_external_package(logilabcommon 1.8.1 )
LCG_external_package(logical_unification 0.4.6 )
LCG_external_package(looseversion 1.3.0 )
LCG_external_package(lwtnn 2.13 )
LCG_external_package(lxml 5.2.2 )
LCG_external_package(lz4 1.9.4 )
......@@ -493,12 +493,12 @@ LCG_external_package(msgpackc 3.2.0
LCG_external_package(multidict 6.0.2 )
LCG_external_package(multipledispatch 1.0.0 )
LCG_external_package(multiprocess 0.70.16 )
LCG_external_package(mypy 1.13.0 )
LCG_external_package(mypy 1.14.1 )
LCG_external_package(mypy_extensions 1.0.0 )
LCG_external_package(mysql 10.5.20 )
LCG_external_package(mysql_connector_python 8.0.18 )
LCG_external_package(namex 0.0.8 )
LCG_external_package(nanobind 2.2.0 )
LCG_external_package(nanobind 2.4.0 )
LCG_external_package(nanomsg 1.1.5 )
LCG_external_package(nbclassic 0.3.1 )
LCG_external_package(nbclient 0.5.3 )
......@@ -537,7 +537,7 @@ LCG_external_package(onnx 1.16.0
LCG_external_package(openai 0.27.8 )
LCG_external_package(opencv_python 4.10.0.84 )
LCG_external_package(openmpi 4.1.6 )
LCG_external_package(openpyxl 3.0.9 )
LCG_external_package(openpyxl 3.1.5 )
LCG_external_package(openqasm3 0.5.0 )
LCG_external_package(opensearch_py 2.2.0 )
if(${LCG_OS} MATCHES mac)
......@@ -711,7 +711,7 @@ if( (${LCG_COMP} MATCHES clang) AND (${LCG_COMPVERS} VERSION_LESS_EQUAL 12) AND
LCG_remove_package(Qt6)
endif()
LCG_external_package(qastle 0.16.0 )
LCG_external_package(qibo 0.2.14 )
LCG_external_package(qibo 0.2.15 )
LCG_external_package(qibojit 0.1.3 )
LCG_external_package(qulacs 0.6.4.1 )
LCG_external_package(qrcode 7.4.2 )
......@@ -752,7 +752,7 @@ LCG_external_package(rq 1.10.1
LCG_external_package(rsa 4.0 )
LCG_external_package(ruamel_yaml 0.17.31 )
LCG_external_package(ruamel_yaml_clib 0.2.7 )
LCG_external_package(ruff 0.8.6 )
LCG_external_package(ruff 0.9.2 )
LCG_external_package(rust 1.82.0 )
LCG_external_package(s3transfer 0.10.3 )
LCG_external_package(safetensors 0.4.3 )
......@@ -831,10 +831,11 @@ LCG_external_package(termcolor 1.1.0
LCG_external_package(terminado 0.10.1 )
LCG_external_package(testpath 0.5.0 )
LCG_external_package(texinfo 6.3 )
LCG_external_package(tex2pix 0.3.1 )
LCG_external_package(texttable 1.7.0 )
LCG_external_package(textual 0.74.0 )
LCG_external_package(tfs_pandas 3.5.1 )
LCG_external_package(tf_keras 2.16.0 )
LCG_external_package(tf_keras 2.18.0 )
LCG_external_package(threadpoolctl 3.5.0 )
LCG_external_package(thrift 0.16.0 )
LCG_external_package(tiff 4.2.0 )
......@@ -870,10 +871,12 @@ LCG_external_package(tzlocal 2.0.0
LCG_external_package(tzdata 2024.1 )
LCG_external_package(uc_micro_py 1.0.2 )
LCG_external_package(uhi 0.3.0 )
LCG_external_package(ultralytics 8.3.58 )
LCG_external_package(ultralytics_thop 2.0.13 )
LCG_external_package(umesimd 0.8.1 )
LCG_external_package(uncertainties 3.1.7 )
LCG_external_package(unigen 2.2 )
LCG_External_package(upandas 0.2.0 )
#LCG_External_package(upandas 0.2.0 )
LCG_external_package(uproot 5.3.11 )
LCG_external_package(uproot_browser 0.6.7 )
LCG_external_package(urllib3 1.26.16 )
......@@ -908,7 +911,7 @@ LCG_external_package(xapian 1.4.18
LCG_external_package(xarray 2022.3.0 )
LCG_external_package(xenv 1.0.0 )
LCG_external_package(XercesC 3.2.4 author=3.2.4 )
LCG_external_package(xgboost 2.0.3 )
LCG_external_package(xgboost 2.1.3 )
LCG_external_package(xqilla 2.3.4 )
LCG_external_package(xlrd 2.0.1 )
LCG_external_package(xrootd 5.7.2 )
......@@ -927,7 +930,8 @@ LCG_external_package(zipp 3.15.0
LCG_external_package(zlib 1.2.11 )
LCG_external_package(zstandard 0.22.0 )
LCG_external_package(OWSLib 0.17.1 )
#---
LCG_external_package(webcolors 24.11.1 )
#---EMI-2 grid externals and other binary packages---------------------
if(${LCG_OS} MATCHES mac)
LCG_external_package(libosxunwind 0.0.6 )
......
......@@ -22,8 +22,10 @@ if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu20) # No MPI support for ubuntu20 n
LCG_external_package(sherpa-openmpi 3.0.1p1.openmpi3 ${MCGENPATH}/sherpa hepmc=${HEPMC_VERSION} author=3.0.1 hepevt=200000)
endif()
LCG_external_package(openloops 2.1.3p1 ${MCGENPATH}/openloops)
LCG_external_package(herwig3 7.2.3p2 ${MCGENPATH}/herwig++ thepeg=2.2.3 hepmc=${HEPMC_VERSION} author=7.2.3)
LCG_external_package(openloops 2.1.3p2 ${MCGENPATH}/openloops)
LCG_external_package(thepeg 2.3.0 ${MCGENPATH}/thepeg hepmc=${HEPMC_VERSION})
LCG_external_package(herwig3 7.3.0p1 ${MCGENPATH}/herwig++ thepeg=2.3.0 hepmc=${HEPMC_VERSION} author=7.3.0)
LCG_external_package(yoda 2.0.2 ${MCGENPATH}/yoda )
LCG_external_package(rivet 4.0.2 ${MCGENPATH}/rivet hepmc=${HEPMC_VERSION} author=4.0.2)
......@@ -42,7 +44,7 @@ endif()
LCG_external_package(collier 1.2.8 ${MCGENPATH}/collier)
LCG_external_package(syscalc 1.1.7 ${MCGENPATH}/syscalc)
LCG_external_package(madgraph5amc 3.5.5.atlas11 ${MCGENPATH}/madgraph5amc author=3.5.5)
LCG_external_package(madgraph5amc 3.5.7.atlas11 ${MCGENPATH}/madgraph5amc author=3.5.7)
LCG_external_package(lhapdf 6.5.5 ${MCGENPATH}/lhapdf )
......@@ -53,7 +55,7 @@ endif()
LCG_external_package(feynhiggs 2.10.2 ${MCGENPATH}/feynhiggs )
LCG_external_package(chaplin 1.2 ${MCGENPATH}/chaplin )
LCG_external_package(pythia8 312.atlas2 ${MCGENPATH}/pythia8 author=312)
LCG_external_package(pythia8 313 ${MCGENPATH}/pythia8 author=313)
LCG_external_package(looptools 2.15 ${MCGENPATH}/looptools)
......@@ -65,8 +67,6 @@ LCG_external_package(qgraf 3.1.4 ${MCGENPATH}/qgraf)
LCG_external_package(gosam_contrib 2.0 ${MCGENPATH}/gosam_contrib)
LCG_external_package(gosam 2.1.2 ${MCGENPATH}/gosam)
LCG_external_package(thepeg 2.2.3 ${MCGENPATH}/thepeg hepmc=${HEPMC_VERSION})
LCG_external_package(tauola++ 1.1.8.atlas1 ${MCGENPATH}/tauola++ author=1.1.8 hepmc=${HEPMC_VERSION})
LCG_external_package(pythia6 429.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=200000 )
......@@ -77,7 +77,7 @@ LCG_external_package(evtgen 2.2.1 ${MCGENPATH}/evtgen
LCG_external_package(hijing 1.383bs.2 ${MCGENPATH}/hijing )
LCG_external_package(starlight r313 ${MCGENPATH}/starlight )
LCG_external_package(starlight r330 ${MCGENPATH}/starlight )
LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd )
......@@ -108,7 +108,7 @@ LCG_external_package(jhu 5.6.3 ${MCGENPATH}/jhu
LCG_external_package(rapidsim 1.4.4 ${MCGENPATH}/rapidsim )
LCG_external_package(superchic 5.3 ${MCGENPATH}/superchic author=5.3 )
LCG_external_package(superchic 5.4 ${MCGENPATH}/superchic author=5.4 )
LCG_external_package(cepgen 1.2.5patch2 ${MCGENPATH}/cepgen )
if(NOT ${LCG_OS} MATCHES ubuntu|mac)
......
#---List of externals
set(LCG_PYTHON_VERSION 3)
include(heptools-dev3)
#
#py312
#
LCG_external_package(Python 3.12.7 )
#
# temporary remove package professor until generators toolchain ins fixed
LCG_remove_package(professor)
LCG_external_package(openloops 2.1.3 ${MCGENPATH}/openloops)
#
LCG_external_package(pep517 0.13.1 )
LCG_external_package(prctl 1.8.1 )
LCG_external_package(MarkupSafe 2.1.5 )
###LCG_external_package(threadpoolctl 3.5.0 )
LCG_remove_package(messaging)
#LCG_external_package(messaging 1.2 )
LCG_external_package(testpath 0.6.0 )
LCG_external_package(pandocfilters 1.5.1 )
LCG_external_package(termcolor 2.4.0 )
LCG_external_package(debugpy 1.8.1 )
LCG_external_package(HeapDict 1.0.1 )
LCG_external_package(configobj 5.0.9 )
LCG_external_package(cffi 1.16.0 )
LCG_external_package(babel 2.15.0 )
#LCG_external_package(protobuf 5.27.1 )
#LCG_external_package(scikitbuild 0.17.6 )
LCG_external_package(scikitbuild 0.18.0 )
LCG_external_package(bcrypt 4.1.3 )
LCG_external_package(pynacl 1.5.0 )
LCG_external_package(argon2_cffi 23.1.0 )
LCG_external_package(argon2_cffi_bindings 21.2.0 )
###LCG_external_package(partd 1.4.2 )
LCG_external_package(sphinx 8.1.3 )
LCG_external_package(opt_einsum 3.3.0 )
#LCG_external_package(minio 7.2.7 )
LCG_external_package(minio 7.2.10 )
LCG_external_package(llvmlite 0.43.0 )
LCG_external_package(pydantic_core 2.27.1 )
LCG_external_package(qastle 0.17.0 )
LCG_external_package(jax 0.4.35 )
LCG_external_package(jaxlib 0.4.35 )
LCG_external_package(aiohttp 3.9.5 )
LCG_external_package(greenlet 3.0.3 )
LCG_external_package(func_adl 3.3.3 )
LCG_external_package(ruamel_yaml_clib 0.2.12 )
LCG_external_package(ruamel_yaml 0.18.10 )
LCG_external_package(pysimdjson 6.0.2 )
##LCG_external_package(pylint 3.3.3 )
##LCG_external_package(qibo 0.2.13 )
LCG_external_package(pydantic 2.10.5 )
LCG_external_package(pywt 1.6.0 )
LCG_external_package(grpcio 1.65.2 )
#LCG_external_package(torchvision 0.18.1 )
###LCG_external_package(torchvision 0.20.1 ) # test to see if test fail (nms) fixed
LCG_external_package(numba 0.60.0 )
LCG_external_package(qibojit 0.1.7 )
###LCG_external_package(tensorflow 2.18.0 ) # test to see if test fail=distutil is fixed
#LCG_external_package(tensorflow_cpu 2.18.0 ) # test to see if test fail=distutil is fixed
LCG_external_package(tensorflow_io_gcs_filesystem 0.37.1 )
#LCG_external_package(snappy 1.2.1 )
LCG_external_package(sphinx_rtd_theme 3.0.2 )
#LCG_external_package(looseversion 1.3.0 )
LCG_external_package(omniorb 4.3.2 )
LCG_external_package(cython 3.0.11 )
LCG_external_package(blosc 1.11.2 )
LCG_external_package(dask_kubernetes 2024.9.0 )
LCG_external_package(dask_jobqueue 0.9.0 )
#LCG_external_package(dask 2024.9.1 )
LCG_external_package(dask 2024.11.2 ) # was previously downgraded to 2024.9.1
LCG_external_package(cartopy 0.24.1 )
LCG_external_package(ipython 8.29.0 )
LCG_external_package(ipyparallel 9.0.0 )
LCG_external_package(rise 5.7.2.2 )
#LCG_external_package(ipywidgets 7.8.5 ) # was 8.1.5 requested downgrade by itkwidgets
LCG_external_package(ipywidgets 8.1.5 )
#next 2 pkgs only for devswan
LCG_external_package(comm 0.2.2 )
LCG_external_package(jupyterlab_widgets 3.0.13 )
LCG_external_package(notebook 6.4.12 )
LCG_external_package(jupyter_console 6.6.3 )
LCG_external_package(jupyter_nbextensions_configurator 0.6.4 )
LCG_external_package(jupyter_core 5.7.2 )
LCG_external_package(jupyter_client 8.6.2 )
LCG_external_package(jupyterlab 4.3.0 )
LCG_external_package(jupyterlab_server 2.27.3 )
LCG_external_package(jupyterlab_rise 0.42.0 )
LCG_external_package(jupyterlab_pygments 0.3.0 )
LCG_external_package(jupyter_server 2.14.2 )
LCG_external_package(jupyter_server_terminals 0.5.3 )
LCG_external_package(jupyter_events 0.10.0 )
LCG_external_package(jupyter_contrib_core 0.4.2 )
LCG_external_package(traitlets 5.14.3 )# was 5.14.3 downgraded by itkwidgets
#LCG_external_package(traitlets 5.6.0 )# was 5.14.3 downgraded by itkwidgets
LCG_external_package(imjoy_utils 0.1.2 )
LCG_external_package(imjoy_rpc 0.5.59 )
LCG_external_package(zarr 3.0.0 )
LCG_external_package(itkwasm 1.0b185 )
LCG_external_package(itkwidgets 1.0a53 )
LCG_external_package(decorator 5.1.1 )
LCG_external_package(pyzmq 26.2.0 )# https://stackoverflow.com/questions/17275875
LCG_external_package(Jinja2 3.1.4 )
###LCG_external_package(tornado 6.4.1 )
LCG_external_package(prompt_toolkit 3.0.47 )
#LCG_external_package(psutil 6.0.0 ) #use previous version for python version consistency
###LCG_external_package(lxml 5.2.2 )
LCG_external_package(jsonschema 4.23.0 )
LCG_external_package(jupyter_latex_envs 1.4.6 author=1.4.6 )
LCG_external_package(nbconvert 7.16.4 )
LCG_external_package(ipykernel 6.29.5 )
LCG_external_package(widgetsnbextension 4.0.13 )
##LCG_external_package(onnxruntime 1.18.1 )
LCG_external_package(arrow 17.0.0 )
LCG_external_package(pyarrow 17.0.0 )
LCG_external_package(setuptools 75.1.0 )
LCG_external_package(setuptools_scm 8.1.0 )
##LCG_external_package(torch 2.5.0 )
LCG_external_package(send2trash 1.8.3 )
LCG_external_package(astropy 6.1.4 )
LCG_external_package(matplotlib 3.9.2 )
LCG_external_package(matplotlib_inline 0.1.7 )
##LCG_external_package(boto3 1.35.41 )
##LCG_external_package(botocore 1.35.41 )
LCG_external_package(altair 5.4.1 )
LCG_external_package(stack_data 0.6.3 )
LCG_external_package(accelerate 1.0.1 )
###LCG_external_package(numpy 1.26.4 ) #commit bd6ce031 use 1st Py12 compatible version of numpy
LCG_external_package(colorcet 3.1.0 )
###LCG_external_package(scipy 1.14.1 )
LCG_external_package(narwhals 1.9.4 )
LCG_external_package(pytensor 2.26.4 )
LCG_external_package(blosc2 2.7.1 )
LCG_external_package(importlib_metadata 8.5.0 )
LCG_external_package(importlib_resources 6.5.2 )
LCG_external_package(future 1.0.0 )
LCG_external_package(h5py 3.12.1 )
LCG_external_package(executing 2.1.0 )
LCG_external_package(numexpr 2.10.1 )
###LCG_external_package(s3transfer 0.10.3 )
LCG_external_package(hepdata_converter 0.3.0 )
LCG_external_package(huggingface_hub 0.26.2 )
#LCG_external_package(ipydatawidgets 4.3.5 )
LCG_external_package(ipydatawidgets 4.3.2 )
LCG_external_package(asttokens 2.4.1 )
LCG_external_package(pure_eval 0.2.3 )
LCG_external_package(astropy_iers_data 0.2024.10.21.0.33.21 )
LCG_external_package(crypto 1.4.1 )
LCG_external_package(python_box 7.2.0 )
LCG_external_package(naked 0.1.32 )
LCG_external_package(shellescape 3.8.1 )
LCG_external_package(servicex 3.0.1 )
LCG_external_package(tqdm 4.66.6 )
LCG_external_package(miniopy_async 1.21.1 )
LCG_external_package(joblib 1.4.2 )
LCG_external_package(platformdirs 4.3.6 )
LCG_external_package(overrides 7.7.0 )
LCG_external_package(keras 3.7.0 )
LCG_external_package(keras_tuner 1.4.7 )
LCG_external_package(metakernel 0.30.2 )
LCG_external_package(lightning_utilities 0.11.9 )
LCG_external_package(typing_extensions 4.12.2 )
LCG_external_package(pycryptodome 3.21.0 )
LCG_external_package(PyYAML 6.0.2 )
LCG_external_package(requests 2.32.3 )
LCG_external_package(nbclassic 1.1.0 )
LCG_external_package(charset_normalizer 3.4.0 )
LCG_external_package(chardet 5.2.0 )
LCG_external_package(urllib3i 2.2.3 )
LCG_external_package(certifi 2024.8.30 )
LCG_external_package(pyerfa 2.0.1.4 )
LCG_external_package(aiofile 3.9.0 )
LCG_external_package(notebook_shim 0.2.4 )
LCG_external_package(pipenv 2024.4.0 )
LCG_external_package(pyct 0.5.0 )
LCG_external_package(tex2pix 0.3.1 )
LCG_external_package(sphinxcontrib_jquery 4.1 )
LCG_external_package(pyshp 2.3.1 )
LCG_external_package(kr8s 0.17.4 ) #update to the latest (now back to 0.17.4 following cons. check ) and add dependencies: asyncache cryptography httpx_ws
LCG_external_package(distributed 2024.11.2 )
LCG_external_package(zipp 3.20.2 )
###LCG_external_package(ml_dtypes 0.4.1 )
LCG_external_package(pythran 0.17.0 )
LCG_external_package(qtconsole 5.6.1 )
LCG_external_package(qtpy 2.4.2 )
LCG_external_package(safetensors 0.4.5 )
LCG_external_package(scikitlearn 1.5.2 )
LCG_external_package(caio 0.9.17 )
LCG_external_package(httpx_ws 0.7.1 )
LCG_external_package(httpx 0.28.1 )
##LCG_external_package(absl_py 1.2.0 )#was 2.1.0
###LCG_external_package(flatbuffers 24.3.25 )
LCG_external_package(idna 3.10 )
LCG_external_package(libclang 18.1.1 )
LCG_external_package(wrapt 1.16.0 )
LCG_external_package(wheel 0.45.0 )
LCG_external_package(werkzeug 3.1.3 )
LCG_external_package(markdown 3.7 )
LCG_external_package(hdf5 1.14.5 )
LCG_external_package(PyHEADTAIL 1.16.4 )
LCG_external_package(pytables 3.10.2 )
LCG_external_package(wsproto 1.2.0 )
LCG_external_package(rfc3339_validator 0.1.4 )
LCG_external_package(rfc3986_validator 0.1.1 )
LCG_external_package(jupyter_lsp 2.2.5 )
LCG_external_package(async_lru 2.0.4 )
LCG_external_package(asyncache 0.3.1 )
LCG_external_package(tinydb 4.8.2 )
LCG_external_package(aiohttp_retry 2.9.1 )
LCG_external_package(memory_profiler 0.61.0 )
LCG_external_package(hepstats 0.9.0 )
LCG_external_package(ccorp_yaml_include_relative_path 0.0.4 )
LCG_external_package(typer 0.15.1 )
LCG_external_package(types_pyyaml 6.0.12.20240917 )
LCG_external_package(cryptography 43.0.3 )
LCG_external_package(shellingham 1.5.4 )
LCG_external_package(virtualenv 20.28.0 )
LCG_external_package(gast 0.6.0 )
LCG_external_package(websocket_client 1.8.0 )
LCG_external_package(pystan 3.10.0 )
LCG_external_package(filelock 3.16.1 )
LCG_external_package(tenacity 9.0.0 )
LCG_external_package(alabaster 1.0.0 )
LCG_external_package(imagesize 1.4.1 )
LCG_external_package(sphinxcontrib_serializinghtml 2.0.0 )
LCG_external_package(fsphinxcontrib_applehelp 2.0.0 )
LCG_external_package(sphinxcontrib_devhelp 2.0.0 )
LCG_external_package(sphinxcontrib_qthelp 2.0.0 )
LCG_external_package(docutils 0.21.2 )
###LCG_external_package(tensorboard 2.18.0 )
LCG_external_package(scikit_hep 2024.10.1 )
LCG_external_package(anyio 4.6.1 )
LCG_external_package(httpcore 1.0.7 )
LCG_external_package(ngff_zarr 0.10.2 )
LCG_external_package(beniget 0.4.2.post1 )
#LCG_external_package(langchain_community 0.3.9 )
LCG_external_package(langchain_core 0.3.29 )#was 0.3.21 then set to 0.2.43 for consistency
LCG_external_package(langchain 0.3.14 )
LCG_external_package(httpstan 4.13.0 )
LCG_external_package(snowballstemmer 2.2.0 )
LCG_external_package(sphinxcontrib_applehelp 2.0.0 )
LCG_external_package(sphinxcontrib_htmlhelp 2.1.0 )
LCG_external_package(distlib 0.3.9 )
LCG_external_package(json_logger 2.0.7 ) #python_json_logger
LCG_external_package(histoprint 2.5.0 )
LCG_external_package(iminuit 2.30.1 )
LCG_external_package(uproot 5.5.1 )
LCG_external_package(avro 1.12.0 )
LCG_external_package(fsspec 2024.12.0 )
LCG_external_package(numcodecs 0.14.1 )
#-
LCG_external_package(httpx_sse 0.4.0 )
LCG_external_package(pydantic_settings 2.6.1 )
LCG_external_package(shortuuid 1.0.13 )
LCG_external_package(websockets 14.1 )
LCG_external_package(asciitree 0.3.3 )
LCG_external_package(crc32c 2.7.1 )
LCG_external_package(donfig 0.8.1.post1 )
LCG_external_package(itkwasm_downsample 1.4.3 )
LCG_external_package(rich_argparse 1.6.0 )
LCG_external_package(wasmtime 28.0.0 )
LCG_external_package(langsmith 0.2.10 )
LCG_external_package(langchain_text_splitters 0.3.5 )
###LCG_external_package(webcolors 24.11.1 )
LCG_external_package(openapi_core 0.19.4 )
LCG_external_package(jsonschema_path 0.3.3 )
LCG_external_package(requests_toolbelt 1.0.0 )
LCG_external_package(langchain_community 0.3.14 )
LCG_external_package(python_dotenv 1.0.1 )
LCG_external_package(referencing 0.35.1 )
LCG_external_package(pathable 0.4.4 )
LCG_external_package(isodate 0.7.2 )
LCG_external_package(more_itertools 10.6.0 )
LCG_external_package(openapi_schema_validator 0.6.3 )
LCG_external_package(openapi_spec_validator 0.7.1 )
LCG_external_package(parse 1.20.2 )
LCG_external_package(rich 13.9.4 )
LCG_external_package(pyxxhash 3.5.0 )
LCG_external_package(itkwasm_downsample_wasi 1.5.0 )
......@@ -5,11 +5,9 @@ include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT v6-32-00-patches GIT=http://root.cern.ch/git/root.git)
LCG_external_package(ROOT v6-34-00-patches GIT=http://root.cern.ch/git/root.git)
#LCG_AA_project(ROOT 6.32.06)
LCG_external_package(Boost 1.87.0)
#if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu|el)
# if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 7)) OR (${LCG_COMP} MATCHES clang))
# LCG_AA_project(Gaudi v36r14.testtbb GIT=https://gitlab.cern.ch/dkonst/Gaudi.git)
......
......@@ -18,7 +18,7 @@ LCG_external_package(veccore 0.8.1 )
LCG_external_package(g4hepem 20250106 )
LCG_top_packages(cuda VecGeom veccore Vc alpaka Boost lcgenv CMake ninja doxygen pytest Geant4 g4hepem)
LCG_top_packages(cuda VecGeom veccore Boost lcgenv CMake ninja doxygen pytest Geant4 g4hepem hepmc3 pandas)
#---Remove unneeded packages that create problems------------------
LCG_remove_package(huggingface_hub)
......@@ -48,8 +48,11 @@ LCG_remove_package(zfit)
LCG_remove_package(zfit_physics)
LCG_remove_package(hls4ml)
#---We don't need ROOT in dev but without a defined version CMake fails
LCG_external_package(ROOT v6.22.06 CUDA=OFF)
LCG_remove_package(ultralytics)
LCG_remove_package(ultralytics_thop)
LCG_external_package(ROOT v6.32.08 CUDA=OFF)
# cudnn not part of top_packages, remove root dependency on cudnn
# cudnn depends on CUDA version, tarball might be missing
# LCG_external_package(cudnn 7.6.5.32)
......
cublas.dll
cublasLt.dll
cuda_fp16.h
cuda_fp16.hpp
cuda_occupancy.h
cudadevrt.lib
cudart.dll
cudart_static.lib
cufft.dll
cufft.lib
cufftw.dll
cufftw.lib
cufile.h
cupti.dll
curand.dll
curand.lib
cusolver.dll
cusolver.lib
cusparse.dll
cusparse.lib
libcublas.dylib
libcublas.so
libcublasLt.dylib
libcublasLt.so
libcublasLt_static.a
libcublas_static.a
libcuda.so
libcudadevrt.a
libcudart.dylib
libcudart.so
libcudart_static.a
libcufft.dylib
libcufft.so
libcufft_static.a
libcufftw.dylib
libcufftw.so
libcufftw_static.a
libcufile.so
libcufile_rdma.so
libcufile_rdma_static.a
libcufile_static.a
libculibos.a
libcupti.dylib
libcupti.so
libcurand.dylib
libcurand.so
libcurand_static.a
libcusolver.dylib
libcusolver.so
libcusolver_static.a
libcusparse.dylib
libcusparse.so
libcusparse_static.a
libdevice.10.bc
libnppc.dylib
libnppc.so
libnppc_static.a
libnppial.dylib
libnppial.so
libnppial_static.a
libnppicc.dylib
libnppicc.so
libnppicc_static.a
libnppicom.dylib
libnppicom.so
libnppicom_static.a
libnppidei.dylib
libnppidei.so
libnppidei_static.a
libnppif.dylib
libnppif.so
libnppif_static.a
libnppig.dylib
libnppig.so
libnppig_static.a
libnppim.dylib
libnppim.so
libnppim_static.a
libnppist.so
libnppist_static.a
libnppisu.so
libnppisu_static.a
libnppitc.dylib
libnppitc.so
libnppitc_static.a
libnpps.dylib
libnpps.so
libnpps_static.a
libnvJitLink.dll
libnvJitLink.lib
libnvJitLink.so
libnvJitLink_static.a
libnvToolsExt.dylib
libnvToolsExt.so
libnvblas.dylib
libnvblas.so
libnvidia-ptxjitcompiler.so
libnvjpeg.so
libnvjpeg_static.a
libnvptxcompiler_static.a
libnvrtc-builtins.dylib
libnvrtc-builtins.so
libnvrtc.dylib
libnvrtc.so
libnvrtc_static.a
libnvrtx-builtins_static.a
libnvvm.dylib
libnvvm.so
nppc.dll
nppc.lib
nppial.dll
nppial.lib
nppicc.dll
nppicc.lib
nppicom.dll
nppicom.lib
nppidei.dll
nppidei.lib
nppif.dll
nppif.lib
nppig.dll
nppig.lib
nppim.dll
nppim.lib
nppist.dll
nppist.lib
nppisu.dll
nppisu.lib
nppitc.dll
nppitc.lib
npps.dll
npps.lib
nvToolsExt.dll
nvToolsExt.lib
nvblas.dll
nvjpeg.dll
nvjpeg.lib
nvrtc-builtins.dll
nvrtc.dll
nvrtc.h
nvvm.dll
......@@ -629,6 +629,16 @@
"license": null,
"name": "capturer"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "cccl"
},
{
"category": null,
"contacts": [],
......@@ -2009,6 +2019,16 @@
"license": null,
"name": "itkwasm_downsample"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "itkwasm_downsample_wasi"
},
{
"category": null,
"contacts": [],
......@@ -2109,6 +2129,16 @@
"license": null,
"name": "json_logger"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "jsonschema_path"
},
{
"category": null,
"contacts": [],
......@@ -2359,6 +2389,16 @@
"license": null,
"name": "langsmith"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "lap"
},
{
"category": null,
"contacts": [],
......@@ -3149,6 +3189,26 @@
"license": null,
"name": "openapi_schema_pydantic"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "openapi_schema_validator"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "openapi_spec_validator"
},
{
"category": null,
"contacts": [],
......@@ -3359,6 +3419,16 @@
"license": null,
"name": "patchelf"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "pathable"
},
{
"category": null,
"contacts": [],
......@@ -3789,6 +3859,16 @@
"license": null,
"name": "python_box"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "python_dotenv"
},
{
"category": null,
"contacts": [],
......@@ -4619,6 +4699,16 @@
"license": null,
"name": "tfs_pandas"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "thop"
},
{
"category": null,
"contacts": [],
......@@ -4859,6 +4949,36 @@
"license": null,
"name": "uhi"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "ultralytics"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "ultralytics_thop"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"name": "ultralyticsthop"
},
{
"category": null,
"contacts": [],
......
......@@ -735,6 +735,14 @@
"extra_notes": null,
"version": "106a_swan"
},
{
"extra_notes": null,
"version": "106a_nxcals_testbed"
},
{
"extra_notes": null,
"version": "106a_nxcals_pro"
},
{
"extra_notes": null,
"version": "106a_cuda"
......
......@@ -574,7 +574,6 @@ LCGPackage_Add(
TEST_AFTER_INSTALL 1
REVISION IF LCG_TARGET MATCHES ubuntu20|mac THEN 6 ELSE 5 ENDIF
)
#---setuptools------------------------------------------------------------------------------------------------------
LCGPackage_Add(
setuptools
......@@ -592,62 +591,72 @@ LCGPackage_Add(
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python
DEPENDS Python
)
#---six------------------------------------------------------------------------------------------------------
#---pip------------------------------------------------------------------------------------------------------
LCGPackage_Add(
six
URL ${GenURL}/six-${six_native_version}.tar.gz
pip
URL ${GenURL}/pip-${pip_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>
#IF LCG_SOURCE_INSTALL THEN COMMAND $ENV{SHELL} -c "chmod -R 755 <INSTALL_DIR>/../share/sources/six" ENDIF
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
DEPENDS Python setuptools
)
#---webencodings--------------------------------------------------------------------------------------------------------
LCGPackage_set_home(wheel)
#---wheel------------------------------------------------------------------------------------------------------
LCGPackage_Add(
webencodings
URL ${GenURL}/webencodings-${webencodings_native_version}.tar.gz
wheel
URL ${GenURL}/wheel-${wheel_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
IF <VERSION> VERSION_GREATER_EQUAL 0.45.0 THEN
COMMAND ${PYTHON} -m pip install ${PySetupOptions} . --no-deps
ELSE
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
ENDIF
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
DEPENDS Python setuptools
IF <VERSION> VERSION_GREATER_EQUAL 0.45.0 THEN pip ENDIF
)
#---wheel------------------------------------------------------------------------------------------------------
#---six------------------------------------------------------------------------------------------------------
LCGPackage_Add(
wheel
URL ${GenURL}/wheel-${wheel_native_version}.tar.gz
six
URL ${GenURL}/six-${six_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
IF ${Python_native_version} VERSION_GREATER_EQUAL 3.12.7 THEN
COMMAND ${PYTHON} -m pip install ${PySetupOptions} --no-deps .
ELSE
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
ENDIF
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
#IF LCG_SOURCE_INSTALL THEN COMMAND $ENV{SHELL} -c "chmod -R 755 <INSTALL_DIR>/../share/sources/six" ENDIF
BUILD_IN_SOURCE 1
DEPENDS Python setuptools
)
DEPENDS Python setuptools IF ${Python_native_version} VERSION_GREATER_EQUAL 3.12.7 THEN pip ENDIF
#---pip------------------------------------------------------------------------------------------------------
)
#---webencodings--------------------------------------------------------------------------------------------------------
LCGPackage_Add(
pip
URL ${GenURL}/pip-${pip_native_version}.tar.gz
webencodings
URL ${GenURL}/webencodings-${webencodings_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 wheel
DEPENDS Python setuptools
)
#---html5lib------------------------------------------------------------------------------------------------------------
LCGPackage_Add(
html5lib
......@@ -1134,6 +1143,21 @@ LCGPackage_Add(
BUILD_IN_SOURCE 1
)
#---looseversion-----------------------------------------------------------------------------------------------------
LCGPackage_Add(
looseversion
URL ${GenURL}/looseversion-<NATIVE_VERSION>.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} -m pip install ${PySetupOptions} . --no-deps
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools pip
)
#---glib-----------------------------------------------------------------------------------------------
if(LCG_TARGET MATCHES "mac")
set(glib_config_options "LIBFFI_CFLAGS=-I${CMAKE_OSX_SYSROOT}/usr/include/ffi" "LIBFFI_LIBS=-L${CMAKE_OSX_SYSROOT}/usr/lib")
......@@ -1159,8 +1183,9 @@ LCGPackage_Add(
INSTALL_COMMAND ${MAKE} install -i
ENDIF
BUILD_IN_SOURCE 1
DEPENDS libffi pkg_config gettext
DEPENDS libffi pkg_config gettext looseversion
IF <VERSION> VERSION_GREATER_EQUAL 2.76 THEN meson pcre2 ninja ELSE pcre ENDIF
# IF ${Python_native_version} VERSION_GREATER_EQUAL 3.12.4 THEN looseversion ENDIF
)
#---freetype--------------------------------------------------------------------------------------------
......@@ -1541,7 +1566,11 @@ LCGPackage_Add(
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
IF <VERSION> VERSION_GREATER_EQUAL 0.60.0 THEN
COMMAND ${PYTHON} -m pip install ${PySetupOptions} . --no-deps
ELSE
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
ENDIF
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools numpy llvmlite
......@@ -1555,17 +1584,28 @@ endif()
LCGPackage_Add(
flatbuffers
URL ${GenURL}/flatbuffers-<flatbuffers_native_version>.tar.gz
ENVIRONMENT VERSION=<VERSION>
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=Release
-DFLATBUFFERS_INSTALL=ON
-DFLATBUFFERS_BUILD_FLATLIB=ON
-DFLATBUFFERS_BUILD_FLATC=ON
-DFLATBUFFERS_BUILD_TESTS=OFF
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -Wno-int-conversion -Wno-unused-but-set-variable ${flatbuffers_flags_apple}"
INSTALL_COMMAND ${MAKE} install
COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR>/python ${PYTHON} setup.py install ${PySetupOptions}
DEPENDS setuptools numpy
# IF <VERSION> VERSION_GREATER_EQUAL 24.3.25 THEN
#
# CONFIGURE_COMMAND <VOID>
# BUILD_COMMAND <VOID>
# INSTALL_COMMAND ${MakeSitePackagesDir}
# COMMAND ${PYTHON} -m pip install ${PySetupOptions} . --no-deps
# COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
# BUILD_IN_SOURCE 1
# ELSE
ENVIRONMENT VERSION=<VERSION>
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=Release
-DFLATBUFFERS_INSTALL=ON
-DFLATBUFFERS_BUILD_FLATLIB=ON
-DFLATBUFFERS_BUILD_FLATC=ON
-DFLATBUFFERS_BUILD_TESTS=OFF
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -Wno-int-conversion -Wno-unused-but-set-variable ${flatbuffers_flags_apple}"
INSTALL_COMMAND ${MAKE} install
COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR>/python ${PYTHON} setup.py install ${PySetupOptions}
# ENDIF
DEPENDS setuptools numpy
# IF <VERSION> VERSION_GREATER_EQUAL 24.3.25 THEN pip ENDIF
)
#---Boost--------------------------------------------------------------------------------------------
......@@ -2127,9 +2167,9 @@ LCGPackage_Add(
URL ${GenURL}/openmpi-${openmpi_native_version}.tar.gz
IF ${LCG_OS} MATCHES mac THEN
ENVIRONMENT MACOSX_DEPLOYMENT_TARGET=11.0
ENVIRONMENT SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk # Fix when the Foundation framework is not found
ENDIF
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
--enable-mpi-cxx
--disable-dependency-tracking
--disable-silent-rules
--enable-ipv6
......@@ -2597,9 +2637,9 @@ LCGPackage_Add(
LCGPackage_Add(
protobuf
IF <VERSION> VERSION_GREATER_EQUAL 3.18.1 OR <VERSION> VERSION_EQUAL 3.7.1 THEN
URL ${GenURL}/protobuf-all-${protobuf_native_version}.tar.gz
URL ${GenURL}/protobuf-all-${protobuf_native_version}.tar.gz
ELSE
URL ${GenURL}/protobuf-${protobuf_native_version}.tar.gz
URL ${GenURL}/protobuf-${protobuf_native_version}.tar.gz
ENDIF
IF <VERSION> VERSION_GREATER_EQUAL 3.20.3 THEN
ENVIRONMENT
......@@ -3404,10 +3444,14 @@ LCGPackage_Add(
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
IF <VERSION> VERSION_GREATER_EQUAL 1.16.0 THEN
COMMAND ${PYTHON} -m pip install ${PySetupOptions} . --no-deps
ELSE
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
ENDIF
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python setuptools pycparser libffi
DEPENDS Python setuptools pycparser libffi IF <VERSION> VERSION_GREATER_EQUAL 1.16.0 THEN pip ENDIF
)
#---zstandard------------------------------------------------------------------------------------------------------
......
--- ./gio/gdbus-2.0/codegen/utils.py~ 2023-04-21 16:46:05.000000000 +0200
+++ ./gio/gdbus-2.0/codegen/utils.py 2024-06-26 16:22:51.035198607 +0200
@@ -22 +22,2 @@
-import distutils.version
+#import distutils.version
+from looseversion import LooseVersion
@@ -165 +166,2 @@
- return (distutils.version.LooseVersion(v), key[1])
+# return (distutils.version.LooseVersion(v), key[1])
+ return (LooseVersion(v), key[1])
......@@ -8,4 +8,57 @@
+#elif PROTOBUF_GNUC_MIN(12, 2)
#define PROTOBUF_CONSTINIT __constinit
#define PROTOBUF_CONSTEXPR constexpr
#else
\ No newline at end of file
#else
--- ./python/setup.py~ 2022-09-29 23:09:51.000000000 +0200
+++ ./python/setup.py 2024-06-25 17:03:37.877360070 +0200
@@ -7 +7,3 @@
-from distutils import util
+#from distutils import util
+import sysconfig
+
@@ -24,4 +26,7 @@
-from distutils.command.build_ext import build_ext as _build_ext
-from distutils.command.build_py import build_py as _build_py
-from distutils.command.clean import clean as _clean
-from distutils.spawn import find_executable
+#from distutils.command.build_ext import build_ext as _build_ext
+from setuptools.command.build_ext import build_ext as _build_ext
+#from distutils.command.build_py import build_py as _build_py
+from setuptools.command.build_py import build_py as _build_py
+#from distutils.command.clean import clean as _clean
+#from distutils.spawn import find_executable
+import shutil
@@ -41 +46,2 @@
- protoc = find_executable('protoc')
+ protoc = shutil.which('protoc')
+# protoc = find_executable('protoc')
@@ -134,13 +140,13 @@
-class CleanCmd(_clean):
- """Custom clean command for building the protobuf extension."""
-
- def run(self):
- # Delete generated files in the code tree.
- for (dirpath, unused_dirnames, filenames) in os.walk('.'):
- for filename in filenames:
- filepath = os.path.join(dirpath, filename)
- if (filepath.endswith('_pb2.py') or filepath.endswith('.pyc') or
- filepath.endswith('.so') or filepath.endswith('.o')):
- os.remove(filepath)
- # _clean is an old-style class, so super() doesn't work.
- _clean.run(self)
+#class CleanCmd(_clean):
+# """Custom clean command for building the protobuf extension."""
+#
+# def run(self):
+# # Delete generated files in the code tree.
+# for (dirpath, unused_dirnames, filenames) in os.walk('.'):
+# for filename in filenames:
+# filepath = os.path.join(dirpath, filename)
+# if (filepath.endswith('_pb2.py') or filepath.endswith('.pyc') or
+# filepath.endswith('.so') or filepath.endswith('.o')):
+# os.remove(filepath)
+# # _clean is an old-style class, so super() doesn't work.
+# _clean.run(self)
@@ -347 +353 @@
- 'clean': CleanCmd,
+ # 'clean': CleanCmd,
......@@ -831,9 +831,9 @@ LCGPackage_Add(
ELSE
BUILD_COMMAND ./openloops libinstall --jobs=5 ${openloops_public_proc_arm} compile_extra=1
ENDIF
COMMAND bash -c "sed -i 's/^process_repositories.*/process_repositories = matrix,powheg/' <SOURCE_DIR>/pyol/config/default.cfg"
COMMAND bash -c "sed -i 's/^process_repositories.*/process_repositories = matrix,powheg,ATLAS/' <SOURCE_DIR>/pyol/config/default.cfg"
COMMAND ./openloops libinstall --jobs=5 all.coll compile_extra=1
COMMAND bash -c "sed -i 's/^process_repositories.*/process_repositories = matrix,powheg,public/' <SOURCE_DIR>/pyol/config/default.cfg"
COMMAND bash -c "sed -i 's/^process_repositories.*/process_repositories = matrix,powheg,ATLAS,public/' <SOURCE_DIR>/pyol/config/default.cfg"
COMMAND ./openloops libinstall --jobs=5 pphtt_nf compile_extra=1
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/process_obj
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/process_src
......
......@@ -55,7 +55,7 @@ LCGPackage_Add(
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
COMMAND chmod -R go+r <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS gosam_contrib qgraf FORM Python pip
DEPENDS gosam_contrib qgraf FORM Python setuptools IF <VERSION> VERSION_GREATER_EQUAL 2.1.2 THEN pip ENDIF
)
......
--- ./setup.py~ 2021-08-26 12:16:55.000000000 +0200
+++ ./setup.py 2024-10-08 17:10:21.959107853 +0200
@@ -2,0 +3,37 @@
+import os
+try:
+ from distutils.core import setup
+ from distutils.sysconfig import get_config_vars
+ from distutils.command.build_py import build_py as _build_py
+ from distutils.command.install_scripts import install_scripts as _install_scripts
+ from distutils.command.install import install as _install
+ from distutils.command.install_data import install_data as _install_data
+ from distutils.util import change_root as _change_root
+ from distutils import log
+except:
+ from setuptools import setup
+ from sysconfig import get_config_vars
+ from setuptools.command.build_py import build_py as _build_py
+ from setuptools.command.install_scripts import install_scripts as _install_scripts
+ from setuptools.command.install import install as _install
+# from setuptools._distutils.command.install_data import install_data as _install_data
+ from distutils.command.install_data import install_data as _install_data
+ import logging as log
+#From https://github.com/pypa/distutils/blob/main/distutils/util.py
+ def _change_root(new_root, pathname):
+ """Return 'pathname' with 'new_root' prepended. If 'pathname' is
+ relative, this is equivalent to "os.path.join(new_root,pathname)".
+ Otherwise, it requires making 'pathname' relative and then joining the
+ two, which is tricky on DOS/Windows and Mac OS.
+ """
+ if os.name == 'posix':
+ if not os.path.isabs(pathname):
+ return os.path.join(new_root, pathname)
+ else:
+ return os.path.join(new_root, pathname[1:])
+
+ elif os.name == 'nt':
+ (drive, path) = os.path.splitdrive(pathname)
+ if path[0] == '\\':
+ path = path[1:]
+ return os.path.join(new_root, path)
@@ -4,8 +40,0 @@
-from distutils.core import setup
-from distutils.sysconfig import get_config_vars
-from distutils.command.build_py import build_py as _build_py
-from distutils.command.install_scripts import install_scripts as _install_scripts
-from distutils.command.install import install as _install
-from distutils.command.install_data import install_data as _install_data
-from distutils.util import change_root as _change_root
-from distutils import log
@@ -14,0 +44 @@
+import re
@@ -36,3 +66,11 @@
- if "-" not in line:
- raise Exception("No git repository, and no revision number found in PKG-INFO " + line.strip())
- return line.split("-", 1)[1].strip()
+ if "-" in line:
+ result=re.search('gosam-([0-9.]*)-([a-z,0-9]*)',line)
+ if result:
+ return result.group(2)
+ return None
+ if line.startswith("Download-URL: "):
+ if "-" in line:
+ result=re.search('gosam-([0-9.]*)-([a-z,0-9]*)',line)
+ if result:
+ return result.group(2)
+ return None
@@ -50 +88 @@
- 'version': TAR_VERSION,
+ 'version': VERSION,
--- MatrixElement/Matchbox/Matching/ShowerApproximation.h.orig 2023-06-02 16:43:47.462555108 +0200
+++ MatrixElement/Matchbox/Matching/ShowerApproximation.h 2023-06-02 16:44:56.368269080 +0200
@@ -144,7 +144,7 @@
/**
* Return true, if this matching is capable of spin correlations.
*/
- virtual bool hasSpinCorrelations() const { return false; }
+ virtual bool hasSpinCorrelations() const { return true; }
public:
This diff is collapsed.
--- src/inputParser.cpp.orig
+++ src/inputParser.cpp
@@ -54,5 +54,5 @@
return -1;
}
- int lineSize = 256;
+ const int lineSize = 256;
char tmp[lineSize];
int nParameters = 0;
-int lineSize = 256;
+const int lineSize = 256;
--- src/starlightStandalone.cpp.orig
+++ src/starlightStandalone.cpp
@@ -83,5 +83,5 @@
}
- int lineSize = 256;
+ const int lineSize = 256;
char tmp[lineSize];
while (!infile.getline(tmp, lineSize).eof())