Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 46 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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
166 changes: 0 additions & 166 deletions Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions conda_env.yml

This file was deleted.

Loading
Loading