nested-fit 6.0.0.dev137__tar.gz → 6.0.0.dev139__tar.gz

{nested_fit-6.0.0.dev137/nested_fit.egg-info → nested_fit-6.0.0.dev139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nested_fit
-Version: 6.0.0.dev137
+Version: 6.0.0.dev139
 Summary: The nested_fit package.
 Author: Martino Trassinelli, Lune Maillard, César Godinho
 Project-URL: Homepage, https://github.com/martinit18/nested_fit
@@ -87,6 +87,22 @@ needs; the driver is the only other requirement, no CUDA toolkit. The likelihood
 the GPU, on at most 8 threads, whenever a startup self-test finds that faster than all the CPU
 threads together, and on the CPU otherwise, with one log line saying which. Details and controls in `src/gpu/README.md`.
 
+### What must be installed on the machine
+
+nested_fit compiles your model at run time, so two compilers are needed on every machine it runs
+on, with the pip wheel as much as with a source build; without them a run stops before sampling.
+
+| system | compilers | GPU (optional) |
+|---|---|---|
+| Ubuntu, Debian | `sudo apt install gfortran g++` | NVIDIA driver, then `pip install "nested_fit[cuda]"` |
+| Fedora, RHEL, Rocky | `sudo dnf install gcc-gfortran gcc-c++` | same |
+| macOS | `brew install gcc` (gfortran) and `xcode-select --install` (clang++) | no GPU support on macOS |
+| conda environments | `conda install -c conda-forge gfortran cxx-compiler` | as above |
+
+The Linux wheel needs glibc 2.28 or newer (Ubuntu 20.04, Debian 10, RHEL 8 and later); older
+systems build from source, see below. On an AMD GPU the ROCm runtime with hipRTC plays the role of
+the driver and the `[cuda]` extra; that path is written and has not been run yet.
+
 The `examples/` directory is bundled with the package. After installation you can
 copy it to a local working area in a couple of ways:
 

nested_fit-6.0.0.dev137/PKG-INFO → nested_fit-6.0.0.dev139/README.md

@@ -1,30 +1,3 @@
-Metadata-Version: 2.4
-Name: nested_fit
-Version: 6.0.0.dev137
-Summary: The nested_fit package.
-Author: Martino Trassinelli, Lune Maillard, César Godinho
-Project-URL: Homepage, https://github.com/martinit18/nested_fit
-Project-URL: Bug Tracker, https://github.com/martinit18/nested_fit/issues
-Classifier: Programming Language :: Fortran
-Classifier: Programming Language :: C++
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: numpy
-Requires-Dist: matplotlib
-Requires-Dist: scipy
-Requires-Dist: getdist
-Requires-Dist: rich
-Requires-Dist: plotly
-Requires-Dist: psutil
-Requires-Dist: anesthetic
-Requires-Dist: plotext
-Provides-Extra: cuda
-Requires-Dist: nvidia-cuda-nvrtc-cu12; extra == "cuda"
-Dynamic: license-file
-
 # NESTED FIT
 
 Nested_fit is a data analysis program based on the Bayesian statistics for the computation of, for a given set of data and chosen model, the complete probability distribution for each parameter and the Bayesian evidence.
@@ -87,6 +60,22 @@ needs; the driver is the only other requirement, no CUDA toolkit. The likelihood
 the GPU, on at most 8 threads, whenever a startup self-test finds that faster than all the CPU
 threads together, and on the CPU otherwise, with one log line saying which. Details and controls in `src/gpu/README.md`.
 
+### What must be installed on the machine
+
+nested_fit compiles your model at run time, so two compilers are needed on every machine it runs
+on, with the pip wheel as much as with a source build; without them a run stops before sampling.
+
+| system | compilers | GPU (optional) |
+|---|---|---|
+| Ubuntu, Debian | `sudo apt install gfortran g++` | NVIDIA driver, then `pip install "nested_fit[cuda]"` |
+| Fedora, RHEL, Rocky | `sudo dnf install gcc-gfortran gcc-c++` | same |
+| macOS | `brew install gcc` (gfortran) and `xcode-select --install` (clang++) | no GPU support on macOS |
+| conda environments | `conda install -c conda-forge gfortran cxx-compiler` | as above |
+
+The Linux wheel needs glibc 2.28 or newer (Ubuntu 20.04, Debian 10, RHEL 8 and later); older
+systems build from source, see below. On an AMD GPU the ROCm runtime with hipRTC plays the role of
+the driver and the `[cuda]` extra; that path is written and has not been run yet.
+
 The `examples/` directory is bundled with the package. After installation you can
 copy it to a local working area in a couple of ways:
 

nested_fit-6.0.0.dev137/README.md → nested_fit-6.0.0.dev139/nested_fit.egg-info/PKG-INFO

@@ -1,3 +1,30 @@
+Metadata-Version: 2.4
+Name: nested_fit
+Version: 6.0.0.dev139
+Summary: The nested_fit package.
+Author: Martino Trassinelli, Lune Maillard, César Godinho
+Project-URL: Homepage, https://github.com/martinit18/nested_fit
+Project-URL: Bug Tracker, https://github.com/martinit18/nested_fit/issues
+Classifier: Programming Language :: Fortran
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: matplotlib
+Requires-Dist: scipy
+Requires-Dist: getdist
+Requires-Dist: rich
+Requires-Dist: plotly
+Requires-Dist: psutil
+Requires-Dist: anesthetic
+Requires-Dist: plotext
+Provides-Extra: cuda
+Requires-Dist: nvidia-cuda-nvrtc-cu12; extra == "cuda"
+Dynamic: license-file
+
 # NESTED FIT
 
 Nested_fit is a data analysis program based on the Bayesian statistics for the computation of, for a given set of data and chosen model, the complete probability distribution for each parameter and the Bayesian evidence.
@@ -60,6 +87,22 @@ needs; the driver is the only other requirement, no CUDA toolkit. The likelihood
 the GPU, on at most 8 threads, whenever a startup self-test finds that faster than all the CPU
 threads together, and on the CPU otherwise, with one log line saying which. Details and controls in `src/gpu/README.md`.
 
+### What must be installed on the machine
+
+nested_fit compiles your model at run time, so two compilers are needed on every machine it runs
+on, with the pip wheel as much as with a source build; without them a run stops before sampling.
+
+| system | compilers | GPU (optional) |
+|---|---|---|
+| Ubuntu, Debian | `sudo apt install gfortran g++` | NVIDIA driver, then `pip install "nested_fit[cuda]"` |
+| Fedora, RHEL, Rocky | `sudo dnf install gcc-gfortran gcc-c++` | same |
+| macOS | `brew install gcc` (gfortran) and `xcode-select --install` (clang++) | no GPU support on macOS |
+| conda environments | `conda install -c conda-forge gfortran cxx-compiler` | as above |
+
+The Linux wheel needs glibc 2.28 or newer (Ubuntu 20.04, Debian 10, RHEL 8 and later); older
+systems build from source, see below. On an AMD GPU the ROCm runtime with hipRTC plays the role of
+the driver and the `[cuda]` extra; that path is written and has not been run yet.
+
 The `examples/` directory is bundled with the package. After installation you can
 copy it to a local working area in a couple of ways:
 

{nested_fit-6.0.0.dev137 → nested_fit-6.0.0.dev139}/nested_fit.egg-info/SOURCES.txt

@@ -154,6 +154,7 @@ nested_fit.egg-info/requires.txt
 nested_fit.egg-info/top_level.txt
 pynested_fit/__init__.py
 pynested_fit/cliw.py
+pynested_fit/compilers.py
 pynested_fit/evaluator.py
 pynested_fit/metadata.py
 pynested_fit/nested_res.py

{nested_fit-6.0.0.dev137 → nested_fit-6.0.0.dev139}/pynested_fit/cliw.py

@@ -6,7 +6,9 @@ import os
 import sys
 import subprocess
 from .metadata import __version__
+from .compilers import require_compilers
 
 def main():
+    require_compilers(sys.argv[1:])
     exe = os.path.join(os.path.dirname(__file__), f'nested_fit{__version__}')
     sys.exit(subprocess.call([exe] + sys.argv[1:]))

nested_fit-6.0.0.dev139/pynested_fit/compilers.py

@@ -0,0 +1,21 @@
+# nested_fit compiles the model at run time, so gfortran and g++ must be on the PATH of the machine
+# running it, with the pip wheel as with a source build. Checked before the binary starts; the binary
+# repeats the check at the compile itself, for those who run it without Python.
+import shutil
+import sys
+
+MESSAGE = ("`{}` was not found. nested_fit compiles your model at run time and needs gfortran and g++ installed.\n"
+           "Ubuntu/Debian: sudo apt install gfortran g++ ; Fedora/RHEL: sudo dnf install gcc-gfortran gcc-c++ ; macOS: brew install gcc\n"
+           'See "What must be installed on the machine" in README.md.')
+# command lines that name their own tools, or compile nothing
+SKIP = {'--compile-cpp', '-cc', '--compile-f90', '-cf', '--cache-link', '-cl',
+        '--cache-location', '--function-list', '-fl', '--help', '-h'}
+
+
+def require_compilers(argv=()):
+    if SKIP & set(argv):
+        return
+    for tool in ('gfortran', 'g++'):
+        if shutil.which(tool) is None:
+            print(MESSAGE.format(tool), file=sys.stderr)
+            sys.exit(2)

{nested_fit-6.0.0.dev137 → nested_fit-6.0.0.dev139}/pynested_fit/nested_run.py

@@ -12,6 +12,7 @@ from rich.table import Table as RTable
 from rich import box as rbox
 import importlib.util
 import os
+from .compilers import require_compilers
 
 
 def _backend_env():
@@ -597,6 +598,7 @@ class Configurator():
         - output_mode='full': full output with graphs (not working on mac yet)
         '''
         nf_bin = self._get_nf_realpath()
+        require_compilers()
 
         self._write_yaml_file(path)
 

{nested_fit-6.0.0.dev137 → nested_fit-6.0.0.dev139}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nested_fit"
-version = "6.0.0.dev137"
+version = "6.0.0.dev139"
 description = "The nested_fit package."
 readme = "README.md"
 
@@ -74,7 +74,7 @@ environment = "CFLAGS='-static-libgcc -static-libstdc++' CXXFLAGS='-static-libgc
 repair-wheel-command = "auditwheel repair --exclude libgomp.so.1 -w {dest_dir} {wheel}"
 
 [tool.setuptools_scm]
-fallback_version = "6.0.0.dev137"
+fallback_version = "6.0.0.dev139"
 
 [options]
 python_requires = ">=3.8"

{nested_fit-6.0.0.dev137 → nested_fit-6.0.0.dev139}/src/funceval/auto_func.f90

@@ -624,6 +624,22 @@ MODULE MOD_AUTOFUNC
         IF(ANY([ CHARACTER(8) :: 'cpp', 'cxx', 'c++', 'inl' ].EQ.ext)) HAS_VALID_CPP_EXT = .TRUE.
     END FUNCTION 
 
+    SUBROUTINE TOOL_NOT_FOUND(cmd)
+        ! The shell could not run the compiler or linker of a run-time compile command: say which
+        ! program is missing and how to install it, instead of the runtime's "Invalid command line"
+        ! error and its backtrace.
+        CHARACTER(LEN=*), INTENT(IN) :: cmd
+        INTEGER :: i
+        i = INDEX(cmd, ' ')
+        IF(i.EQ.0) i = LEN_TRIM(cmd) + 1
+        CALL LOG_ERROR_HEADER()
+        CALL LOG_ERROR('`'//cmd(1:i-1)//'` was not found. nested_fit compiles your model at run time and needs gfortran and g++ installed.')
+        CALL LOG_ERROR('Ubuntu/Debian: sudo apt install gfortran g++ ; Fedora/RHEL: sudo dnf install gcc-gfortran gcc-c++ ; macOS: brew install gcc')
+        CALL LOG_ERROR('See "What must be installed on the machine" in README.md. Aborting Execution...')
+        CALL LOG_ERROR_HEADER()
+        STOP 2   ! a non-zero exit code, as the runtime error gave before, for the scripts that call nested_fit
+    END SUBROUTINE
+
     SUBROUTINE COMPILE_CACHE_FUNC_NATIVE(filename, write_metadata)
         CHARACTER(LEN=*),   INTENT(IN) :: filename
         LOGICAL, OPTIONAL , INTENT(IN) :: write_metadata
@@ -635,7 +651,7 @@ MODULE MOD_AUTOFUNC
         CHARACTER(128) :: ext_help_text
         CHARACTER(64)  :: compiler_spec
         CHARACTER(512) :: output
-        INTEGER        :: status
+        INTEGER        :: status, cstat
         LOGICAL        :: write_meta_ = .TRUE.
 
         CHARACTER(c_char), DIMENSION(:), POINTER :: c_input_lang
@@ -687,7 +703,8 @@ MODULE MOD_AUTOFUNC
 
         CALL LOG_TRACE('Compiling native function `'//TRIM(parsed_data%function_name)//'` from file `'//TRIM(filename)//'`.')
         
-        CALL EXECUTE_COMMAND_LINE(TRIM(compiler_spec)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(parsed_data%function_name)//'.o', EXITSTAT=status)
+        CALL EXECUTE_COMMAND_LINE(TRIM(compiler_spec)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(parsed_data%function_name)//'.o', EXITSTAT=status, CMDSTAT=cstat)
+        IF(cstat.NE.0 .OR. status.EQ.127) CALL TOOL_NOT_FOUND(TRIM(compiler_spec))
         IF(status.NE.0) THEN
             CALL LOG_ERROR_HEADER()
             CALL LOG_ERROR('Failed to compile the function provided.')
@@ -726,7 +743,7 @@ MODULE MOD_AUTOFUNC
         CHARACTER(LEN=512), INTENT(IN) :: original_data
         LOGICAL, OPTIONAL , INTENT(IN) :: write_metadata
         CHARACTER(LEN=128)             :: filename
-        INTEGER                        :: status
+        INTEGER                        :: status, cstat
         CHARACTER(128)                 :: funcname, funcname_lowercase
         INTEGER                        :: argc
         CHARACTER(512)                 :: expression
@@ -789,7 +806,8 @@ MODULE MOD_AUTOFUNC
             WRITE(77,'(a)') 'end function '//TRIM(funcname)
         CLOSE(77)
 
-        CALL EXECUTE_COMMAND_LINE(TRIM(opt_f90_comp_cmd)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(funcname)//TRIM(obj_ext), EXITSTAT=status)
+        CALL EXECUTE_COMMAND_LINE(TRIM(opt_f90_comp_cmd)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(funcname)//TRIM(obj_ext), EXITSTAT=status, CMDSTAT=cstat)
+        IF(cstat.NE.0 .OR. status.EQ.127) CALL TOOL_NOT_FOUND(TRIM(opt_f90_comp_cmd))
         IF(status.NE.0) THEN
             CALL LOG_ERROR_HEADER()
             CALL LOG_ERROR('Failed to compile the function provided.')
@@ -850,7 +868,7 @@ MODULE MOD_AUTOFUNC
         INTEGER, INTENT(IN)                      :: mfg_nparams
 
         CHARACTER(128)                 :: filename
-        INTEGER                        :: status
+        INTEGER                        :: status, cstat
         CHARACTER(128)                 :: mfg_lowercase
         INTEGER                        :: argc
         CHARACTER(512)                 :: expression
@@ -902,7 +920,8 @@ MODULE MOD_AUTOFUNC
             WRITE(77,'(a)') 'end function '//TRIM(mfg_name)
         CLOSE(77)
 
-        CALL EXECUTE_COMMAND_LINE(TRIM(opt_f90_comp_cmd)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(mfg_name)//TRIM(obj_ext), EXITSTAT=status)
+        CALL EXECUTE_COMMAND_LINE(TRIM(opt_f90_comp_cmd)//' '//TRIM(filename)//' -o '//TRIM(nf_cache_folder)//'user/'//TRIM(mfg_name)//TRIM(obj_ext), EXITSTAT=status, CMDSTAT=cstat)
+        IF(cstat.NE.0 .OR. status.EQ.127) CALL TOOL_NOT_FOUND(TRIM(opt_f90_comp_cmd))
         IF(status.NE.0) THEN
             CALL LOG_ERROR_HEADER()
             CALL LOG_ERROR('Failed to compile the function provided.')
@@ -918,9 +937,10 @@ MODULE MOD_AUTOFUNC
     END SUBROUTINE
 
     SUBROUTINE RECOMPILE_CACHE()
-        INTEGER :: status
+        INTEGER :: status, cstat
 
-        CALL EXECUTE_COMMAND_LINE(TRIM(opt_lnk_cmd)//' '//TRIM(nf_cache_folder)//'*/*'//TRIM(obj_ext)//' -o '//TRIM(dll_name), EXITSTAT=status)
+        CALL EXECUTE_COMMAND_LINE(TRIM(opt_lnk_cmd)//' '//TRIM(nf_cache_folder)//'*/*'//TRIM(obj_ext)//' -o '//TRIM(dll_name), EXITSTAT=status, CMDSTAT=cstat)
+        IF(cstat.NE.0 .OR. status.EQ.127) CALL TOOL_NOT_FOUND(TRIM(opt_lnk_cmd))
         IF(status.NE.0) THEN
             CALL LOG_ERROR_HEADER()
             CALL LOG_ERROR('Failed to link the function provided.')