diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2498da8221..3a6b1f336ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,42 @@ jobs: black -l 160 --check --diff . build: + strategy: + matrix: + python: ["3.12"] + root: ["6.32.10", "6.34.4"] + + runs-on: ubuntu-latest + name: Compile (py${{ matrix.python }}, root${{ matrix.root }}) + + steps: + - uses: actions/checkout@master + with: + path: HiggsAnalysis/CombinedLimit # Required to match compile instructions + - name: Set up Conda + uses: conda-incubator/setup-miniconda@v3 + with: + python-version: 3.12 + miniforge-version: latest + - name: Install build environment + shell: bash -l {0} + run: | + # Install dependencies (synchronize with cms-combine-feedstock recipe.yaml) + mamba install -c conda-forge cmake python==${{ matrix.python }} pandas six gsl root_base==${{ matrix.root }} libboost-devel eigen vdt + - name: Build + shell: bash -l {0} + run: | + Python_SITELIB=$(python3 -c "import sysconfig;p=sysconfig.get_path('purelib');print(p)") + cmake -S HiggsAnalysis/CombinedLimit -B build -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPython_SITELIB=$Python_SITELIB + cmake --build build --clean-first --parallel="${CPU_COUNT}" + cmake --install build # Install to conda prefix (unsafe but ok for CI) + - name: Run tests + shell: bash -l {0} + run: | + cd HiggsAnalysis/CombinedLimit/test + python test_interference.py + + legacy-build: strategy: matrix: python: ["3.8"] @@ -33,39 +69,32 @@ jobs: # python 3.10 root 6.26 - python: "3.10" root: "6.26.4" - # python 3.10 root 6.32 (not available yet) - #- python: "3.10" - # root: "6.32" # version 6.30.07 where the conflicting classes were removed from root is not available, so compiling with 6.32.00 where this issue is resolved runs-on: ubuntu-latest - name: Compile (py${{ matrix.python }}, root${{ matrix.root }}) + name: Legacy compile (py${{ matrix.python }}, root${{ matrix.root }}) steps: - uses: actions/checkout@master with: path: HiggsAnalysis/CombinedLimit # Required to match compile instructions - name: Set up Conda - uses: conda-incubator/setup-miniconda@v2.2.0 + uses: conda-incubator/setup-miniconda@v3 with: - python-version: ${{ matrix.python }} - miniforge-variant: Miniforge3 - channels: conda-forge,defaults - channel-priority: true - activate-environment: combine + python-version: 3.12 + miniforge-version: latest - name: Install build environment shell: bash -l {0} run: | - mamba install -c conda-forge python==${{ matrix.python }} pip pandas root==${{ matrix.root }} gsl tbb vdt boost-cpp boost pcre eigen - cd HiggsAnalysis/CombinedLimit - bash set_conda_env_vars.sh + mamba install -c conda-forge cmake python==${{ matrix.python }} pip pandas root==${{ matrix.root }} gsl tbb vdt boost-cpp boost pcre eigen - name: Build shell: bash -l {0} run: | - cd HiggsAnalysis/CombinedLimit - make CONDA=1 -j 2 + Python_SITELIB=$(python3 -c "import sysconfig;p=sysconfig.get_path('purelib');print(p)") + cmake -S HiggsAnalysis/CombinedLimit -B build -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPython_SITELIB=$Python_SITELIB -DCMAKE_PREFIX_PATH=$CONDA_PREFIX + cmake --build build --clean-first --parallel="${CPU_COUNT}" + cmake --install build # Install to conda prefix (unsafe but ok for CI) - name: Run tests - if: startsWith(matrix.python, '3.') shell: bash -l {0} run: | cd HiggsAnalysis/CombinedLimit/test - python test_interference.py + python test_interference.py \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 0af8decec6c..00000000000 --- a/Makefile +++ /dev/null @@ -1,166 +0,0 @@ -################################################################################ -# HiggsAnalysis/Combined Limit Makefile # -# # -# Authors: Danilo Piparo, Giovanni Petrucciani, Mingshui Chen # -# Revised: Nick Smith 2022 # -# # -# o Automatic compilation of new programs and classes*. # -# o Now generate dictionaries by genreflex # -# # -# * progs should have cpp extension, classes .cc or .cxx, and headers .h # -# # -################################################################################ - -#### SET UP YOUR ENVIRONMENT FIRST WITH ############################## -# source env_standalone.sh -# OR -# source env_lcg.sh (if `make LCG=1` is used to build) -####################################################################### - -# Hardcoded paths for standalone version identical to CMSSW 14_1_X -# These are ignored if either CONDA=1 or LCG=1 is set -BOOST = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-87b5de10acd2f2c8a325345ad058b814 -VDT = /cvmfs/cms.cern.ch/el9_amd64_gcc12/cms/vdt/0.4.3-793cee1e1edef0e54b2bd5cb1f69aec9 -GSL = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gsl/2.6-5e2ce72ea2977ff21a2344bbb52daf5c -EIGEN = /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/eigen/3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e-3ca740c03e68b1a067f3ed0679234a78 -# Compiler and flags ----------------------------------------------------------- -CXX = $(shell root-config --cxx) -ROOTCFLAGS = $(shell root-config --cflags) -ROOTLIBS = $(shell root-config --libs --glibs) -ROOTINC = $(shell root-config --incdir) - -# CMSSW CXXFLAGS plus -Wno-unused-local-typedefs (otherwise we get a flood of messages from BOOST) plus -Wno-unused-function -CCFLAGS = -D STANDALONE $(ROOTCFLAGS) -g -fPIC -O2 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -ftree-vectorize -Wstrict-overflow -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -msse3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wunused -Wparentheses -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -DGNU_GCC -D_GNU_SOURCE -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE -LIBS = $(ROOTLIBS) -lgsl -lRooFit -lRooFitCore -lRooStats -lMinuit -lMathMore -lFoam -lHistFactory -lboost_filesystem -lboost_program_options -lboost_system -lvdt - -ifeq ($(CONDA), 1) -CCFLAGS += -I${CONDA_PREFIX}/include/boost -I ${CONDA_PREFIX}/include/vdt -I ${CONDA_PREFIX}/include/gsl -I ${CONDA_PREFIX}/include/eigen3 -LIBS += -L${CONDA_PREFIX}/lib -else ifeq ($(LCG), 1) -# for some reason, Eigen headers are nested in LCG -CCFLAGS += -I ${CPLUS_INCLUDE_PATH}/eigen3 -LIBS += -L${CPLUS_INCLUDE_PATH}/../lib -else -CCFLAGS += -I$(BOOST)/include -I$(VDT)/include -I$(GSL)/include -I$(EIGEN)/include/eigen3 -LIBS += -L$(BOOST)/lib -L$(VDT)/lib -L$(GSL)/lib -endif - -# Library name ----------------------------------------------------------------- -LIBNAME=HiggsAnalysisCombinedLimit -SONAME=lib$(LIBNAME).so -DICTNAME=$(LIBNAME)_xr - -# Linker and flags ------------------------------------------------------------- -LD = $(shell root-config --ld) -ROOTLDFLAGS = $(shell root-config --ldflags) -ROOTLIBDIR = $(shell root-config --libdir) -# OS x specific linkage -DARWIN := $(shell uname|grep Darwin) -ifdef DARWIN -LDFLAGS = $(ROOTLDFLAGS) -g -shared -install_name @rpath/$(SONAME) -fPIC -EXELDFLAGS = -Wl,-rpath,'@executable_path/../lib' -Wl,-rpath,$(ROOTLIBDIR) -else -LDFLAGS = $(ROOTLDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,-E -Wl,-z,defs -fPIC -EXELDFLAGS = -endif - -# Directory structure ---------------------------------------------------------- -PARENT_DIR = $(shell pwd)/../../ -SRC_DIR = src -INC_DIR = interface -PROG_DIR = bin -SCRIPTS_DIR = scripts -PYTHON_DIR = python -# outputs -OBJ_DIR = build/obj -LIB_DIR = build/lib -EXE_DIR = build/bin - - -# Useful shortcuts ------------------------------------------------------------- -SRCS = $(notdir $(shell ls $(SRC_DIR)/*.cc )) -SRXS = $(notdir $(shell ls $(SRC_DIR)/*.cxx )) -OBJS = $(SRCS:.cc=.o) -OBJS += $(SRXS:.cxx=.o) -PROGS = $(notdir $(wildcard ${PROG_DIR}/*.cpp)) -EXES = $(PROGS:.cpp=) -SCRIPTS = $(notdir $(wildcard ${SCRIPTS_DIR}/*.py)) -PYLIB_DIR = $(LIB_DIR)/python - -#Makefile Rules --------------------------------------------------------------- -.PHONY: clean exe python - -all: exe python - -#--------------------------------------- - -$(OBJ_DIR): - @mkdir -p $(OBJ_DIR)/a - -$(OBJ_DIR)/a/$(DICTNAME).cc: $(SRC_DIR)/classes_def.xml | $(OBJ_DIR) - genreflex $(SRC_DIR)/classes.h -s $< -o $@ --deep --fail_on_warnings --rootmap=$(OBJ_DIR)/a/$(DICTNAME).rootmap --rootmap-lib=$(SONAME) -Isrc -I$(PARENT_DIR) - mv $(OBJ_DIR)/a/$(DICTNAME).rootmap $(LIB_DIR)/ - mv $(OBJ_DIR)/a/$(DICTNAME)_rdict.pcm $(LIB_DIR)/ - -$(OBJ_DIR)/a/%.o: $(OBJ_DIR)/a/%.cc | $(OBJ_DIR) - $(CXX) $(CCFLAGS) -I . -I $(SRC_DIR) -I $(PARENT_DIR) -c $< -o $@ - -#--------------------------------------- - -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cc $(INC_DIR)/%.h | $(OBJ_DIR) - $(CXX) $(CCFLAGS) -I $(INC_DIR) -I $(SRC_DIR) -I $(PARENT_DIR) -c $< -o $@ -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cc $(SRC_DIR)/%.h | $(OBJ_DIR) - $(CXX) $(CCFLAGS) -I $(INC_DIR) -I $(SRC_DIR) -I $(PARENT_DIR) -c $< -o $@ -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cxx $(INC_DIR)/%.h | $(OBJ_DIR) - $(CXX) $(CCFLAGS) -I $(INC_DIR) -I $(SRC_DIR) -I $(PARENT_DIR) -c $< -o $@ - -# this has no header -$(OBJ_DIR)/tdrstyle.o: $(SRC_DIR)/tdrstyle.cc - $(CXX) $(CCFLAGS) -I $(INC_DIR) -c $< -o $@ - -#--------------------------------------- - -$(LIB_DIR): - @mkdir -p $(LIB_DIR) - -${LIB_DIR}/$(SONAME): $(addprefix $(OBJ_DIR)/,$(OBJS)) $(OBJ_DIR)/a/$(DICTNAME).o | $(LIB_DIR) - $(LD) $(LDFLAGS) $(BOOST_INC) $^ $(SOFLAGS) -o $@ $(LIBS) - -#--------------------------------------- - -$(EXE_DIR): - @mkdir -p $(EXE_DIR) - -exe: $(addprefix $(EXE_DIR)/,$(EXES)) $(addprefix $(EXE_DIR)/,$(SCRIPTS)) - @echo $^ - -$(EXE_DIR)/%: $(PROG_DIR)/%.cpp $(LIB_DIR)/$(SONAME) | $(EXE_DIR) - @echo $< - $(CXX) $< -o $@ $(CCFLAGS) -L $(LIB_DIR) -l $(LIBNAME) -I $(INC_DIR) -I $(SRC_DIR) -I $(PARENT_DIR) $(BOOST_INC) $(LIBS) $(EXELDFLAGS) - -$(EXE_DIR)/%.py: $(SCRIPTS_DIR)/%.py | $(EXE_DIR) - cp $< $@ -# macOS System Integrity Protection unsets LD_LIBRARY_PATH for child process started by system programs -# breaking the use of /usr/bin/env in the scripts, so we hardcode the path to python executable instead -ifdef DARWIN - sed -i "" "1s@/.*@$(shell which python)@" $@ -endif - -#--------------------------------------- - -.FORCE: - -python: .FORCE | $(LIB_DIR) - @mkdir -p $(PYLIB_DIR)/HiggsAnalysis/CombinedLimit - @touch $(PYLIB_DIR)/__init__.py - @touch $(PYLIB_DIR)/HiggsAnalysis/__init__.py - @touch $(PYLIB_DIR)/HiggsAnalysis/CombinedLimit/__init__.py - cp -r $(PYTHON_DIR)/* $(PYLIB_DIR)/HiggsAnalysis/CombinedLimit - python3 -m compileall -q $(PYLIB_DIR) - -#--------------------------------------- - -clean: - @rm -rf $(OBJ_DIR) - @rm -rf $(EXE_DIR) - @rm -rf $(LIB_DIR) diff --git a/conda_env.yml b/conda_env.yml deleted file mode 100644 index 8283bc92ee9..00000000000 --- a/conda_env.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: combine -channels: - - conda-forge -dependencies: - - python==3.8 - - pip - - pandas - - root==6.22 - - gsl - - tbb - - vdt - - boost-cpp - - pcre - - eigen diff --git a/conda_env_exact.yml b/conda_env_exact.yml deleted file mode 100644 index d0e8b2fa074..00000000000 --- a/conda_env_exact.yml +++ /dev/null @@ -1,204 +0,0 @@ -name: combine2 -channels: - - conda-forge - - defaults -dependencies: - - _libgcc_mutex=0.1=conda_forge - - _openmp_mutex=4.5=1_llvm - - afterimage=1.21=ha9998ff_1003 - - atk-1.0=2.36.0=h3371d22_4 - - attrs=20.3.0=pyhd3deb0d_0 - - backports=1.0=py27_1 - - backports.functools_lru_cache=1.6.3=pyhd3eb1b0_0 - - backports.shutil_get_terminal_size=1.0.0=py27_1 - - backports_abc=0.5=py27_0 - - binutils=2.34=h2122c62_9 - - binutils_impl_linux-64=2.34=h53a641e_7 - - binutils_linux-64=2.34=hc952b39_18 - - blas=1.0=mkl - - bleach=3.3.0=pyh44b312d_0 - - boost=1.72.0=py27h9de70de_0 - - boost-cpp=1.72.0=h9d3c048_4 - - bzip2=1.0.8=h7f98852_4 - - c-ares=1.17.1=h7f98852_1 - - c-compiler=1.1.1=h516909a_0 - - ca-certificates=2021.1.19=h06a4308_1 - - cairo=1.16.0=h6cf1ce9_1008 - - certifi=2020.6.20=pyhd3eb1b0_3 - - cffi=1.14.0=py27he30daa8_1 - - cfitsio=3.470=hce51eda_7 - - compilers=1.1.1=0 - - configparser=4.0.2=py27_0 - - contextlib2=0.6.0.post1=py_0 - - cxx-compiler=1.1.1=hc9558a2_0 - - davix=0.7.6=hece831a_0 - - decorator=4.4.2=py_0 - - defusedxml=0.7.1=pyhd3eb1b0_0 - - eigen=3.3.9=h4bd325d_1 - - entrypoints=0.3=py27h8c360ce_1001 - - enum34=1.1.10=py27h8c360ce_1 - - expat=2.3.0=h9c3ff4c_0 - - fftw=3.3.9=h27cfd23_1 - - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - - font-ttf-inconsolata=2.001=hab24e00_0 - - font-ttf-source-code-pro=2.030=hab24e00_0 - - font-ttf-ubuntu=0.83=hab24e00_0 - - fontconfig=2.13.1=hba837de_1004 - - fonts-conda-ecosystem=1=0 - - fonts-conda-forge=1=0 - - fortran-compiler=1.1.1=he991be0_0 - - freetype=2.10.4=h0708190_1 - - fribidi=1.0.10=h516909a_0 - - ftgl=2.4.0=hc56bac0_0 - - funcsigs=1.0.2=py27_0 - - functools32=3.2.3.2=py27_2 - - futures=3.3.0=py27h8c360ce_1 - - gcc_impl_linux-64=7.3.0=habb00fd_1 - - gcc_linux-64=7.3.0=h553295d_18 - - gdk-pixbuf=2.42.4=h04a7f16_2 - - gettext=0.20.2=hf68c758_0 - - gfortran_impl_linux-64=7.3.0=hdf63c60_1 - - gfortran_linux-64=7.3.0=h553295d_18 - - giflib=5.2.1=h516909a_2 - - gl2ps=1.4.2=he06d7ca_0 - - glew=2.1.0=h9c3ff4c_2 - - graphite2=1.3.14=h23475e2_0 - - graphviz=2.47.0=he056042_1 - - gsl=2.6=he838d99_2 - - gsoap_abi=2.8.109=ha770c72_0 - - gtk2=2.24.33=hab0c2f8_0 - - gts=0.7.6=h64030ff_2 - - gxx_impl_linux-64=7.3.0=hdf63c60_1 - - gxx_linux-64=7.3.0=h553295d_18 - - harfbuzz=2.8.0=h83ec7ef_1 - - icu=68.1=h58526e2_0 - - importlib_metadata=1.5.0=py27_0 - - ipaddress=1.0.23=py_0 - - ipykernel=4.10.0=py27_1 - - ipyparallel=6.2.4=py27_0 - - ipython=5.8.0=py27_1 - - ipython_genutils=0.2.0=py27_0 - - jinja2=2.11.3=pyh44b312d_0 - - jpeg=9d=h516909a_0 - - jsonschema=3.2.0=py27h8c360ce_1 - - jupyter_client=5.3.4=py27_1 - - jupyter_core=4.6.3=py27h8c360ce_1 - - krb5=1.17.2=h926e7f8_0 - - ld_impl_linux-64=2.34=h53a641e_7 - - libblas=3.9.0=8_mkl - - libcblas=3.9.0=8_mkl - - libcurl=7.76.0=hc4aaa36_0 - - libcxx=10.0.1=hc9558a2_0 - - libcxxabi=10.0.1=0 - - libedit=3.1.20210216=h27cfd23_1 - - libev=4.33=h516909a_1 - - libffi=3.3=h58526e2_2 - - libgcc-ng=9.3.0=h2828fa1_18 - - libgd=2.3.2=h78a0170_0 - - libgfortran-ng=7.5.0=h14aa051_18 - - libgfortran4=7.5.0=h14aa051_18 - - libglib=2.68.0=h3e27bee_2 - - libglu=9.0.0=he1b5a44_1001 - - libiconv=1.16=h516909a_0 - - libllvm8=8.0.1=hc9558a2_0 - - libnghttp2=1.43.0=h812cca2_0 - - libpng=1.6.37=hed695b0_2 - - librsvg=2.50.3=hfa39831_1 - - libsodium=1.0.17=h516909a_0 - - libssh2=1.9.0=ha56f1ee_6 - - libstdcxx-ng=9.3.0=h6de172a_18 - - libtiff=4.2.0=hdc55705_0 - - libtool=2.4.6=h58526e2_1007 - - libuuid=2.32.1=h14c3975_1000 - - libwebp=1.2.0=h3452ae3_0 - - libwebp-base=1.2.0=h7f98852_2 - - libxcb=1.14=h7b6447c_0 - - libxml2=2.9.10=h72842e0_3 - - llvm-openmp=11.1.0=h4bd325d_0 - - llvmlite=0.31.0=py27h5ee40b5_1 - - lz4-c=1.9.2=he1b5a44_3 - - markupsafe=1.1.1=py27hdf8410d_1 - - metakernel=0.27.5=pyhd3deb0d_0 - - mistune=0.8.4=py27hdf8410d_1001 - - mkl=2020.4=h726a3e6_304 - - mkl-service=2.3.0=py27he904b0f_0 - - mkl_fft=1.0.15=py27ha843d7b_0 - - mkl_random=1.1.0=py27hd6b4f25_0 - - more-itertools=5.0.0=py_0 - - nbconvert=5.6.1=py27_0 - - nbformat=4.4.0=py27_0 - - ncurses=6.2=h58526e2_4 - - notebook=5.7.10=py27_0 - - numba=0.47.0=py27hb3f55d8_0 - - numpy=1.16.6=py27hbc911f0_0 - - numpy-base=1.16.6=py27hde5b4d6_0 - - openssl=1.1.1k=h7f98852_0 - - packaging=20.9=pyh44b312d_0 - - pandoc=2.12=h7f98852_0 - - pandocfilters=1.4.2=py27_0 - - pango=1.42.4=h80147aa_5 - - pathlib2=2.3.5=py27h8c360ce_1 - - pcre=8.44=he1b5a44_0 - - pexpect=4.8.0=py27h8c360ce_1 - - pickleshare=0.7.5=py27h8c360ce_1001 - - pip=20.1.1=pyh9f0ad1d_0 - - pixman=0.40.0=h36c2ea0_0 - - portalocker=1.5.2=py27h8c360ce_1 - - prometheus_client=0.9.0=pyhd3deb0d_0 - - prompt_toolkit=1.0.15=py27_0 - - ptyprocess=0.7.0=pyhd3deb0d_0 - - pycparser=2.20=pyh9f0ad1d_2 - - pygments=2.5.2=py_0 - - pyparsing=2.4.7=pyh9f0ad1d_0 - - pyrsistent=0.15.7=py27hdf8410d_1 - - pythia8=8.244=py27haf22ab1_1 - - python=2.7.18=h15b4118_1 - - python-dateutil=2.8.1=py_0 - - python_abi=2.7=1_cp27mu - - pyzmq=19.0.0=py27h76efe43_1 - - readline=8.1=h27cfd23_0 - - root=6.22.0=py27hf09d227_2 - - root-binaries=6.22.0=py27hf09d227_2 - - root-dependencies=6.22.0=py27hf09d227_2 - - root_base=6.22.0=py27h07c60d7_2 - - scandir=1.10.0=py27hdf8410d_1 - - send2trash=1.5.0=py_0 - - setuptools=44.0.0=py27_0 - - simplegeneric=0.8.1=py27_0 - - singledispatch=3.6.1=pyh44b312d_0 - - six=1.15.0=pyh9f0ad1d_0 - - sqlite=3.35.3=h74cdb3f_0 - - tbb=2020.3=hfd86e86_0 - - tbb-devel=2020.3=hfd86e86_0 - - terminado=0.8.3=py27h8c360ce_1 - - testpath=0.4.4=py_0 - - tk=8.6.10=hed695b0_1 - - tornado=5.1.1=py27h14c3975_1000 - - traitlets=4.3.3=py27h8c360ce_1 - - vdt=0.4.3=hf484d3e_0 - - wcwidth=0.2.5=pyh9f0ad1d_2 - - webencodings=0.5.1=py_1 - - wheel=0.36.2=pyhd3deb0d_0 - - xorg-fixesproto=5.0=h14c3975_1002 - - xorg-kbproto=1.0.7=h14c3975_1002 - - xorg-libice=1.0.10=h516909a_0 - - xorg-libsm=1.2.3=hd9c2040_1000 - - xorg-libx11=1.6.12=h516909a_0 - - xorg-libxau=1.0.9=h14c3975_0 - - xorg-libxcursor=1.2.0=h516909a_0 - - xorg-libxext=1.3.4=h516909a_0 - - xorg-libxfixes=5.0.3=h516909a_1004 - - xorg-libxft=2.3.3=h71203ad_0 - - xorg-libxpm=3.5.13=h516909a_0 - - xorg-libxrender=0.9.10=h516909a_1002 - - xorg-libxt=1.1.5=h516909a_1003 - - xorg-renderproto=0.11.1=h14c3975_1002 - - xorg-xextproto=7.3.0=h14c3975_1002 - - xorg-xproto=7.0.31=h14c3975_1007 - - xrootd=4.12.3=py27h25260f6_0 - - xxhash=0.7.4=h516909a_0 - - xz=5.2.5=h516909a_1 - - zeromq=4.3.2=he1b5a44_2 - - zipp=1.0.0=py_0 - - zlib=1.2.11=h516909a_1010 - - zstd=1.4.8=hdf46e1d_0 diff --git a/env_standalone.sh b/env_standalone.sh deleted file mode 100644 index 6a36fe6fb63..00000000000 --- a/env_standalone.sh +++ /dev/null @@ -1,14 +0,0 @@ -# equivalent to CMSSW 14_1_X -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/lcg/root/6.30.07-8b1a11e1ef0e074fdfd44e162b27e71c/etc/profile.d/init.sh -# this also provides py3-six -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/py3-pandas/2.0.1-7e0980e2f417a1fc2106b953723ea098/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/gsl/2.6-5e2ce72ea2977ff21a2344bbb52daf5c/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/tbb/v2021.9.0-7e31cf78e4a7495ff0337c859d1dc314/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/cms/vdt/0.4.3-793cee1e1edef0e54b2bd5cb1f69aec9/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/boost/1.80.0-87b5de10acd2f2c8a325345ad058b814/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/pcre/8.43-e34796d17981e9b6d174328c69446455/etc/profile.d/init.sh -. /cvmfs/cms.cern.ch/el9_amd64_gcc12/external/eigen/3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e-3ca740c03e68b1a067f3ed0679234a78/etc/profile.d/init.sh - export PATH=${PATH}:${PWD}/build/bin - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/build/lib - export PYTHONPATH=${PYTHONPATH}:${PWD}/build/lib/python diff --git a/set_conda_env_vars.sh b/set_conda_env_vars.sh deleted file mode 100644 index 35d27000198..00000000000 --- a/set_conda_env_vars.sh +++ /dev/null @@ -1,3 +0,0 @@ -conda env config vars set PATH=${PATH}:${PWD}/build/bin -conda env config vars set LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/build/lib -conda env config vars set PYTHONPATH=${PYTHONPATH}:${PWD}/build/lib/python