Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cmake, make the conda recipe architecture independent #1980

Merged
merged 2 commits into from
Mar 6, 2024
Merged
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
109 changes: 0 additions & 109 deletions CMakeLists.txt

This file was deleted.

7 changes: 0 additions & 7 deletions conda-recipe/build.sh

This file was deleted.

4 changes: 0 additions & 4 deletions conda-recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@ numpy:

pin_run_as_build:
lhapdf: x.x.x
apfel: x.x.x.x
gsl: x.x.x
yaml-cpp: x.x.x
libarchive: x.x
55 changes: 19 additions & 36 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,49 @@ package:
source:
git_url: ../

build:
noarch: python
script: {{ PYTHON }} -m pip install . -vv
number: 0
detect_binary_files_with_prefix: True
# import CONDA_BUILD_SYSROOT from env variable for osx
script_env:
- CONDA_BUILD_SYSROOT # [osx]

requirements:
build:
- {{ compiler("cxx") }}
- {{ compiler("c") }}
- swig
- cmake
- pkg-config
# See https://github.com/NNPDF/nnpdf/pull/1280
- sysroot_linux-64==2.17 # [linux]
- clang==14 # [osx]
- cmake==3.26 # [osx]
host:
- lhapdf # with python wrapper
- sqlite
- gsl # Gsl doesn't link openblas on old debian 7
- libarchive
- yaml-cpp >=0.6.3
- apfel >=3 # see https://github.com/scarrazza/apfel
- python
- numpy
- python >=3.9,<3.12
- poetry-core >=1.0.0
- poetry-dynamic-versioning >=1.1.0
- poetry-dynamic-versioning >=1.2.0
- pip
run:
- python >=3.9,<3.12
- tensorflow >=2.10
- psutil # to ensure n3fit affinity is with the right processors
- blas==1.0 *mkl* # [osx] # Host's blas is mkl, force also runtime blas to be
- hyperopt
- seaborn
- lhapdf
- sqlite
- gsl
- numpy
- libarchive
- yaml-cpp >=0.6.3
- apfel
- pkg-config
- python # requirements for validphys
- reportengine ==0.30.28 # see https://github.com/NNPDF/reportengine
- curio >=1.0 # reportengine uses it but it's not in its dependencies
- matplotlib >=3.3.0,<3.8 # see https://github.com/NNPDF/nnpdf/pull/1809
- blessings >=1.7
- scipy >=0.19.1
- pandas
- requests
- prompt_toolkit
- validobj
- sphinx >=5.0.2,<6 # documentation. Needs pinning temporarily due to markdown
- recommonmark
- sphinx_rtd_theme >0.5
- sphinxcontrib-bibtex
- pineappl >=0.6.2
- eko >=0.14.1
- fiatlux
- frozendict # needed for caching of data loading
- curio >=1.0 # reportengine uses it but it's not in its dependencies
- sphinx >=5.0.2,<6 # documentation. Needs pinning temporarily due to markdown
- recommonmark
- sphinx_rtd_theme >0.5
- sphinxcontrib-bibtex

test:
requires:
Expand All @@ -70,14 +59,8 @@ test:
source_files:
- "*"

build:
number: 0
detect_binary_files_with_prefix: True
# import CONDA_BUILD_SYSROOT from env variable for osx
script_env:
- CONDA_BUILD_SYSROOT # [osx]

about:
home: https://nnpdf.mi.infn.it/
license: SECRET
license: GPLv3.0
summary: "NNPDF analysis framework"
2 changes: 1 addition & 1 deletion conda-recipe/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ platformstr=`uname`
if [[ "$platformstr" != "Darwin" ]]; then
pytest --pyargs n3fit
else
echo "Skipping tests on Mac"
echo "Skipping n3fit tests on Mac"
fi
25 changes: 0 additions & 25 deletions evolven3fit/CMakeLists.txt

This file was deleted.

Loading