Implement a python-only installation

.gitignore

@@ -1,5 +1,9 @@
+# extra files created to hold the versioning information
+validphys2/src/validphys/_version.py
+
 # extra files created by cmake
 libnnpdf/nnprofile.yaml
+libnnpdf/REAMDE.md
 libnnpdf/scripts/nnpdf.pc
 libnnpdf/src/NNPDF/common.h
 libnnpdf/src/NNPDF/config.h

CMakeLists.txt

@@ -40,9 +40,7 @@ option(ENABLE_OPENMPI "Enable openMPI parallelism." OFF)
 option(ENABLE_TESTS "Enable unit test" OFF)
 option(ENABLE_ASAN "Enable ASAN" OFF)
 option(ENABLE_DEAD_STRIP "Enable use of flag `-dead_strip-dylibs`" OFF)
-option(VP_DEV "validphys in developer mode" ON)
-option(N3_DEV "n3fit in developer mode" ON)
-option(BURN_TAG "burn down the git tag in vp and n3fit (only local non-dev installation)" ON)
+option(NNPDF_DEV "n3fit and validphys in developer mode" ON)
 set(PROFILE_PREFIX "" CACHE STRING "Where you store the 'data' folder. Default empty uses CMAKE_INSTALL_PREFIX/share/NNPDF.")
 
 if (PROFILE_PREFIX)
@@ -148,54 +146,8 @@ add_subdirectory(nnpdfcpp)
 # evolven3fit
 add_subdirectory(n3fit/evolven3fit)
 
-if((BURN_TAG) AND (NOT (VP_DEV) OR NOT (N3_DEV)))
-    # Find out where is the root of the git repository (if available) and finds the correct tag to burn down
-    # in the package. This just sets the variable, the actual burning is done down below by the validphys
-    # or n3fit installation and is found in the version.cmake file as it needs to be done post-installation
-    set(GIT_DIR "--git-dir=${PROJECT_SOURCE_DIR}/.git")
-    # get the current tag (ex: 3.4) and check at the same time whether git is available and the .git folder found
-    execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags OUTPUT_VARIABLE GIT_TAG ERROR_VARIABLE GIT_ERROR)
-    if(GIT_ERROR STREQUAL "")
-        string(STRIP ${GIT_TAG} GIT_TAG)
-        # get the number of revisions since tag happened
-        execute_process(COMMAND git ${GIT_DIR} rev-list ${GIT_TAG}..HEAD --count OUTPUT_VARIABLE GIT_REVN)
-        string(STRIP ${GIT_REVN} GIT_REVN)
-        # get the shortname for the hash
-        execute_process(COMMAND git ${GIT_DIR} rev-parse --short HEAD OUTPUT_VARIABLE GIT_HASH)
-        string(STRIP ${GIT_HASH} GIT_HASH)
-        # find out whether the repository is in a dirty state
-        # (this returns ${GIT_TAG}-dev so we have to remove the tag)
-        execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags --dirty=-dev OUTPUT_VARIABLE GIT_DIRTY)
-        string(STRIP ${GIT_DIRTY} GIT_DIRTY)
-        string(REPLACE "${GIT_TAG}" "" GIT_DIRTY ${GIT_DIRTY})
-        # now concatenate everything
-        # with the format ex: 3.4.1880+g00b1741c-dev
-        set(GIT_VERSION "build_version='${GIT_TAG}.${GIT_REVN}+g${GIT_HASH}${GIT_DIRTY}'")
-        # now set the variable at install time
-        install(CODE "set(GIT_VERSION \"${GIT_VERSION}\")")
-    else(GIT_ERROR STREQUAL "")
-        set(BURN_TAG OFF)
-    endif(GIT_ERROR STREQUAL "")
-endif()
-
-# install validphys2
-if(VP_DEV)
-    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/validphys2)")
-else(VP_DEV)
-    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/validphys2)")
-    if(BURN_TAG)
-        install(CODE "set(LIBRARY \"validphys\")")
-        install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake)
-    endif(BURN_TAG)
-endif(VP_DEV)
-
-# install n3fit
-if(N3_DEV)
-    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/n3fit)")
-else(N3_DEV)
-    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/n3fit)")
-    if(BURN_TAG)
-        install(CODE "set(LIBRARY \"n3fit\")")
-        install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake)
-    endif(BURN_TAG)
-endif(N3_DEV)
+if(NNPDF_DEV)
+    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps -e ${PROJECT_SOURCE_DIR})")
+else(NNPDF_DEV)
+    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR})")
+endif(NNPDF_DEV)

conda-recipe/build.sh

@@ -2,9 +2,6 @@
 
 mkdir build
 cd build
-echo "build_version=\"${PKG_VERSION}\"" > ../n3fit/src/n3fit/version.py
-echo "build_version=\"${PKG_VERSION}\"" > ../validphys2/src/validphys/version.py
-
-cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DVP_DEV=OFF -DN3_DEV=OFF -DBURN_TAG=OFF
+cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DNNPDF_DEV=OFF
 make -j${CPU_COUNT}
 make install

conda-recipe/meta.yaml

@@ -23,6 +23,8 @@ requirements:
         - apfel >=3   # see https://github.com/scarrazza/apfel
         - python
         - numpy
+        - poetry-core >=1.0.0
+        - poetry-dynamic-versioning >=1.1.0
     run:
         - tensorflow >=2.10
         - tensorflow >=2.10 *eigen* # [py < 311]

doc/sphinx/source/data/data-config.rst

@@ -4,22 +4,22 @@
 Organisation of data files
 ==========================
 
-The ``nnpdf++`` code needs to be able to handle a great deal of different
+The ``nnpdf`` code needs to be able to handle a great deal of different
 options with regard to the treatment of both experimental data and theoretical
 choices. In the code, every effort has been made to keep experimental and
 theoretical parameters strictly separate.
-In this section we shall specify the layout of the various ``nnpdf++`` data
+In this section we shall specify the layout of the ``nnpdf`` data
 directory. It is in this directory that all of the read-only data to be used in
-the fit are accessed. The data directory is located in the ``nnpdfcpp`` git
-repository, under the path ``/nnpdfcpp/data/``.
+the fit are accessed. The data directory is located in the ``nnpdf`` git
+repository, under the path ``validphys/src/validphys2/datafiles``.
 
 Experimental data storage
 =========================
 
-The central repository for ``CommonData`` in use by ``nnpdf++`` projects is
-located in the ``nnpdfcpp`` git repository at
+The central repository for ``CommonData`` in use by ``nnpdf`` projects is
+located in the ``nnpdf`` git repository at
 
-	``/nnpdfcpp/data/commondata/``
+	``validphys/src/validphys2/datafiles/commondata``
 
 where a separate ``CommonData`` file is stored for each *Dataset* with the
 filename format
@@ -29,7 +29,7 @@ filename format
 Information on the treatment of systematic uncertainties, provided in
 ``SYSTYPE`` files, is located in the subdirectory
 
-	``/nnpdfcpp/data/commondata/systypes``
+	``commondata/systypes``
 
 Here several ``SYSTYPE`` files may be supplied for each *Dataset*. The
 various options are enumerated by suffix to the filename. The filename format
@@ -47,16 +47,16 @@ Theory lookup table
 
 In order to organise the various different theoretical treatments available, a
 lookup table is provided in ``sqlite3`` format. This lookup table can be found
-in the ``nnpdfcpp`` repository data directory at:
+in the ``nnpdf`` repository data directory at:
 
-	``/nnpdfcpp/data/theory.db``
+	``validphys/src/validphys2/datafiles/theory.db``
 
 This file should only be edited in order to add new theory options. It may be
 edited with any appropriate ``sqlite3``-supported software. A script is provided to
 give a brief overview of the various theory options available. It can be found
 at
 
-	``/nnpdfcpp/data/disp_theory.py``
+	``validphys/src/validphys2/datafiles/disp_theory.py``
 
 and should be run without any arguments.
 

doc/sphinx/source/theory/theoryparamsinfo.md

@@ -3,9 +3,9 @@
 ```
 # Looking up the parameters of a theory
 
-The parameters for all of the theories can be found in the `theory.db` file,
-located in the `<NNPDF install location>/share/NNPDF/data` directory. This is an
-sqlite database file. The information contained within this file can also be
+The parameters for all of the theories can be found in the `theory.db` file.
+The `theory.db` file is installed together as part of the validphys package.
+This is an sqlite database file. The information contained within this file can also be
 viewed [within the docs](theory-indexes).
 
 The tools required to extract the parameters for a given theory are already in

doc/sphinx/source/vp/nnprofile.md

@@ -5,30 +5,28 @@
 The `nnprofile.yaml` file
 =========================
 
-The NNPDF code (both `libnnpdf` and `validphys`) stores some configuration
-options (mostly various URLs and paths) in an `nnprofile.yaml` file, which is
-installed with the code.
+The NNPDF code stores some configuration options (mostly various URLs and paths) in a `.yaml` file
+which is installed alongside the code.
+The default values can be consulted in ``validphys/default_nnprofile.yaml``.
 
-In particular this configuration is used by `validphys` to locate,
+This configuration is used by `validphys` to locate,
 [upload](upload) and [download](download) resources.
 
 Altering profile settings
 --------------------------
 
-The default settings are computed based on the install prefix, from  the input
-file `libnnpdf/nnprofile.yaml.in`. Changes with the intention to affect all uses
-(such as adding a new repository for PDF sets) should be made there.
-
-The default location of the profile file is computed at install time as
-`$(INSTALL_PREFIX)/share/NNPDF/nnprofile.yaml`. The default profile is written
-in that location and the code loads it from there. Users should not override
-that installed file since changes to it will be lost the next time the code is
-installed. However it is possible to alter the profile search location locally
-by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a
-different profile file, which will be loaded instead by the code. Specifying a
-custom profile could be useful to add repositories for specific projects or
+It is possible to set up a custom profile file in:
+```
+  ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml
+```
+such that it will be used by every NNPDF installation (note that `${XDG_CONFIG_HOME}` defaults to `~/.config`)
+or by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a
+different profile file, which will be loaded instead by the code. 
+Specifying a custom profile could be useful to add repositories for specific projects or
 change the paths based on the local filesystem characteristics.
 
+If a custom profile is used, the values defined there will take precedence over the default values defined by NNPDF.
+
 Options
 -------
 
@@ -37,13 +35,22 @@ the code. These should be specified in YAML format.
 
 ```eval_rst
 
-``data_path``
-    The path in the user's system where input data such as CommonData files and
-    FKtables are to be found, and stored when :ref:`downloaded <download>`.
+``nnpdf_share```
+    Main folder for NNPDF shared resources: theories, fits, hyperscans, etc.
+    Ex: ``nnpdf_share: ~/.local/share/NNPDF``.
+    All other paths are defined relative to ``nnpdf_share``.
+    It is possible to set the special key ``RELATIVE_TO_PYTHON``, in this case the code
+    will use as share folder the share folder of the current environment (for instance ``${CONDA_PREFIX}/share/NNPDF``).
+
+``theories_path``
+    The path in the user's system where the theory files (FKtables and ekos)
+    are to be found, and stored when :ref:`downloaded <download>`.
+    Defaults to ``nnpdf_share/theories``.
 
 ``results_path``
     A path where completed fits are to be retrieved from,
     and stored when :ref:`downloaded <download>`.
+    Defaults to ``nnpdf_share/results``.
 
 ``validphys_cache_path``
     A path where to store downloaded validphys resources.

doc/sphinx/source/vp/scripts.rst

@@ -116,9 +116,10 @@ Will result in a fit named :code:`181109-si-nlo-central_DISonly` and a copy name
 in the original directory.
 
 However, by default, fits that are download with :code:`vp-get fit` will be located in the NNPDF
-results directory. This is usually located in
-:code:`~/miniconda3/envs/<nnpdf env>/share/NNPDF/results`. Fits located in this directory can be
-renamed with the :code:`-r` flag.
+results directory.
+The results directory is defined by the ``results_path`` key in the ``nnprofile.yaml`` configuration file
+(usually located in ``~/.config/NNPDF/nnprofile.yaml``).
+Fits located in this directory can be renamed with the :code:`-r` flag.
 
 As an example, suppose the fit :code:`181109-si-nlo-central_DISonly` is located in the NNPDF
 results directory. It can be renamed, irrespective of the current working directory, using

libnnpdf/CMakeLists.txt

@@ -58,6 +58,9 @@ target_link_libraries(nnpdf ${LHAPDF_LIBRARIES} ${GSL_LDFLAGS} ${SQLITE3_LDFLAGS
 
 install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc DESTINATION lib/pkgconfig)
 install(DIRECTORY src/NNPDF DESTINATION include)
+
+file(WRITE ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md "The share folder of NNPDF has been moved, see: https://github.com/NNPDF/nnpdf/pull/1861\n")
+install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md DESTINATION share/NNPDF)
 install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml DESTINATION share/NNPDF)
 install(TARGETS nnpdf DESTINATION lib)
 

n3fit/evolven3fit/CMakeLists.txt

@@ -26,4 +26,3 @@ target_link_libraries(evolven3fit nnpdf ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL
 install(TARGETS evolven3fit DESTINATION bin
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
 GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-

n3fit/src/evolven3fit_new/__init__.py

@@ -0,0 +1 @@
+from validphys._version import __version__

n3fit/src/n3fit/__init__.py

@@ -1,2 +1 @@
-from n3fit.version import build_version
-__version__ = build_version
+from validphys._version import __version__

nnpdfcpp/CMakeLists.txt

@@ -10,15 +10,5 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries)
 # execute project specific targets
 add_subdirectory(src)
 
-# install data
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/data/ DESTINATION ${PROFILE_PREFIX}/data/ MESSAGE_NEVER)
-
-# install results
-install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/results/)
-install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/hyperscan_results/)
-
-file(WRITE ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md "Store here your fit output.")
-install(FILES ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md DESTINATION ${PROFILE_PREFIX}/results/)
-
 # install configs
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/config/ DESTINATION ${PROFILE_PREFIX}/config/)