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.

Sign up for GitHub

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

Jump to bottom

NNPDF data package #2009

Merged
merged 9 commits into from
Mar 18, 2024
Merged

NNPDF data package #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5290840
moved datafiles (including theory cards) in nnpdf_data folder
comane Mar 15, 2024
315cc84
changed import datafiles -> import nnpdf_data
comane Mar 15, 2024
6a25a74
updated nnpdf pyproject for nnpdf_data package
comane Mar 15, 2024
157c37b
try resolve tests by adding ruamel.yaml to conda-recipe
comane Mar 15, 2024
7f24640
added exclude rawdata and filter files in nnpdf_data [tool.poetry], r…
comane Mar 16, 2024
85d7d40
Update fitbot.yml
scarlehoff Mar 17, 2024
647b1d6
added _version.py file and versioning to pyproject.toml
comane Mar 18, 2024
785bd1d
Merge branch 'nnpdf_data_package' of https://github.com/NNPDF/nnpdf i…
comane Mar 18, 2024
6c66944
sync _version from vp and nnpdf
scarlehoff Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/fitbot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
env:
N3FIT_MAXNREP: 20 # total number of replicas to fit
POSTFIT_NREP: 16 # requested replicas for postfit
REFERENCE_SET: NNBOT-80553d777-2024-03-07 # reference set for exact results
REFERENCE_SET: NNBOT-3df54cc4b-2024-03-17 # reference set for exact results
STABLE_REFERENCE_SET: NNBOT-c0f99b7b3-2024-02-28 # reference set for last tag
CONDA_PY: 312
PYTHONHASHSEED: "0"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# extra files created to hold the versioning information
validphys2/src/validphys/_version.py
nnpdf_data/nnpdf_data/_version.py

# Created by https://www.gitignore.io/api/macos

Expand Down
2 changes: 1 addition & 1 deletion buildmaster/old_new_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from validphys.api import API
from validphys.convolution import central_predictions
from validphys.datafiles import path_commondata as old_cd_root
from nnpdf_data import path_commondata as old_cd_root
from validphys.loader import Loader

dataset_names_path = old_cd_root.with_name("new_commondata") / "dataset_names.yml"
Expand Down
2 changes: 1 addition & 1 deletion buildmaster/oldcommondata_porter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from yaml import safe_dump, safe_load

# Prepare the folders by automatically finding them from validphys
from validphys.datafiles import path_commondata as old_cd_root
from nnpdf_data import path_commondata as old_cd_root
from validphys.loader import Loader

# old_cd_root = validphys.datafiles / "commondata"
Expand Down
1 change: 1 addition & 0 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ requirements:
- recommonmark
- sphinx_rtd_theme >0.5
- sphinxcontrib-bibtex
- ruamel.yaml <0.18

test:
requires:
Expand Down
2 changes: 2 additions & 0 deletions nnpdf_data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NNPDF data package
==================
4 changes: 3 additions & 1 deletion ...phys2/src/validphys/datafiles/__init__.py → nnpdf_data/nnpdf_data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from functools import lru_cache
import pathlib

from reportengine.compat import yaml
import ruamel.yaml as yaml

from ._version import __version__

path_vpdata = pathlib.Path(__file__).parent
path_commondata = path_vpdata / "new_commondata"
Expand Down
Loading