DM-41209: Add eups build support

.gitignore

@@ -1,8 +1,12 @@
 # Meson/build
 build
 builddir
+build-debug
+build-release
 python/build
+python/build-release
 python/builddir
+python/gauss2dfit.egg-info/
 
 # IDE folders and files
 .cache/

VERSION

@@ -0,0 +1 @@
+0.1.0

build-cc-debug.sh

@@ -1,2 +1,3 @@
+# Compile and test C++ debug library
 meson compile -C build-debug && meson test -C build-debug
 

build-cc-release.sh

@@ -1,2 +1,3 @@
+# Compile, test and install C++ library
 meson compile -C build-release && meson test -C build-release && meson install -C build-release
 

build-debug.sh

@@ -1 +1,2 @@
+# Compile and tell debug libraries
 ./build-cc-debug.sh && ./build-py-debug.sh

build-py-debug.sh

@@ -1,2 +1,3 @@
-meson compile -C python/build-debug && meson test -C python/build-debug
+# Compile python debug libraries
+meson compile -C python/build-debug
 

build-py-release.sh

@@ -1,2 +1,5 @@
+# Compile, test and install python release libraries
+# Unfortunately, the library must be installed before any python tests are run
+# (otherwise the import will fail)
 meson compile -C python/build-release && meson install -C python/build-release && meson test -C python/build-release
 

clean-build-cc-debug.sh

@@ -0,0 +1 @@
+meson compile -C build-debug --clean

clean-build-cc.sh

@@ -0,0 +1,2 @@
+# Call meson to clean installed C++ library files
+meson compile -C build-release --clean

clean-build-py.sh

@@ -0,0 +1,2 @@
+# Call meson to clean installed Python library files
+meson compile -C python/build-release --clean

clean-cc.sh

@@ -0,0 +1,2 @@
+# Delete the C++ build directory
+rm -rf build-release

clean-py.sh

@@ -0,0 +1,2 @@
+# Delete the Python library build directories
+rm -rf python/build-release

clean.sh

@@ -0,0 +1,2 @@
+# Delete all build directories
+./clean-cc.sh && ./clean-py.sh

include/model.h

@@ -991,7 +991,12 @@ class Model : public ParametricModel {
         for (size_t idx = 0; idx < _size; ++idx) {
             result[idx] = this->_evaluate_observation(idx, print, is_loglike_grad);
         }
-        result[_size] = this->_evaluate_priors(print, normalize_loglike);
+        if(
+            (this->_mode == EvaluatorMode::loglike) || is_loglike_grad
+            || (this->_mode == EvaluatorMode::loglike_image) || (this->_mode == EvaluatorMode::jacobian)
+        ) {
+            result[_size] = this->_evaluate_priors(print, normalize_loglike);
+        }
 
         return result;
     }
@@ -1412,6 +1417,7 @@ class Model : public ParametricModel {
                 const size_t idx_param = _offsets_params.find(param_ref)->second;
                 const auto& grad = grads[idx_param];
 
+                const double value_init = param.get_value();
                 const double value = param.get_value_transformed();
                 double diff = value * findiff_frac;
                 if (std::abs(diff) < findiff_add) diff = findiff_add;
@@ -1438,10 +1444,12 @@ class Model : public ParametricModel {
                     }
                 }
 
-                param.set_value_transformed(value);
-                if (param.get_value_transformed() != value) {
+                param.set_value(value_init);
+                const double value_new = param.get_value();
+                if (value_new != value_init) {
                     throw std::logic_error("Could not return param=" + param.str()
-                                           + " to original value=" + std::to_string(value));
+                                           + to_string_float(value_new) + "; diff="
+                                           + to_string_float(value_new - value_init) + "); check limits");
                 }
                 if (n_failed > 0) {
                     std::sort(ratios.begin(), ratios.end());

meson.build

@@ -1,31 +1,56 @@
 project(
   'libgauss2dfit',
   'cpp',
-  version : '0.1.0',
+  version : run_command('cat', meson.source_root() + '/VERSION', check: true).stdout().strip(),
   license : 'GPL-3.0-or-later',
   default_options : ['cpp_std=c++17',],
 )
 
-gauss2d_dep = dependency('gauss2d')
-gsl_dep = dependency('GSL')
-parameters_dep = dependency('parameters')
+eups = find_program('eups', required: false)
+use_eups = eups.found()
+if use_eups
+	use_eups = run_command('eups', 'list', 'gauss2dfit', check: false).returncode() == 0
+endif
+
+gsl_dep = dependency('gsl', required: false)
+
+if use_eups
+    gauss2d_eupsdir = run_command('eups', 'list', '-d', 'gauss2d', check: true).stdout().strip()
+    cpp = meson.get_compiler('cpp')
+    gauss2d_dep = declare_dependency(
+        dependencies: [cpp.find_library('gauss2d', dirs: [gauss2d_eupsdir + '/build-release/lib64']),],
+        include_directories: gauss2d_eupsdir + '/build-release/include',
+    )
+
+    parameters_eupsdir = run_command('eups', 'list', '-d', 'parameters', check: true).stdout().strip()
+    parameters_dep = declare_dependency(
+        include_directories: parameters_eupsdir + '/build-release/include',
+    )
+else
+    gauss2d_dep = dependency('gauss2d')
+    parameters_dep = dependency('parameters')
+endif
 
 inc = include_directories('include')
 
 depends = declare_dependency(
-  include_directories: inc,
-  dependencies: [gauss2d_dep, gsl_dep, parameters_dep],
+    include_directories: inc,
+    dependencies: [gauss2d_dep, gsl_dep, parameters_dep],
 )
 
 subdir('include')
 subdir('src')
 subdir('tests')
 
-pkg_mod = import('pkgconfig')
-pkg_mod.generate(libraries : gauss2dfitlib,
-                 version : '0.1',
-                 name : 'libgauss2dfit',
-                 filebase : 'gauss2dfit',
-                 description : 'Create, manipulate and evaluate 2D Gaussian mixtures and images thereof.')
+if not use_eups
+    pkg_mod = import('pkgconfig')
+    if pkg_mod.found()
+        pkg_mod.generate(libraries : gauss2dfitlib,
+                         version : '0.1',
+                         name : 'libgauss2dfit',
+                         filebase : 'gauss2dfit',
+                         description : 'Create, manipulate and evaluate 2D Gaussian mixtures and images thereof.')
+    endif
+endif
 
 subdir('doc')

python/README.rst

@@ -8,7 +8,7 @@ Gauss2DFit
    .. todo   :target: https://pypi.python.org/pypi/gauss2dfit
 
 *gauss2dfit* provides python bindings for the C++ libgauss2dfit library.
-Python 3.7+, `pybind11 <https://github.com/pybind/pybind11>`_, and numpy are 
+Python 3.8+, `pybind11 <https://github.com/pybind/pybind11>`_, and numpy are 
 requirements, as numpy arrays are used to store images for tests.
 
 With libgauss2dfit installed, these bindings can be built using meson:

python/VERSION

@@ -0,0 +1 @@
+../VERSION

python/gauss2d/fit/__init__.py

@@ -1,5 +1,5 @@
 import pkgutil
-
 __path__ = pkgutil.extend_path(__path__, __name__)
 
 from ._gauss2d_fit import *
+from ._gauss2d_fit import __version__

python/gauss2d/fit/meson.build

@@ -32,6 +32,22 @@ sources = [
     'pybind11.cc',
 ]
 
+kwargs = {}
+
+eups = find_program('eups', required: false)
+use_eups = eups.found()
+if use_eups
+	use_eups = run_command('eups', 'list', '-d', 'gauss2dfit', check: false).returncode() == 0
+endif
+
+if use_eups
+    # meson.current_build_dir() would be ideal but it seems to delete the file?
+    kwargs = {'install_dir': meson.build_root() + '/lib/gauss2d/fit'}
+else
+    # Folder relative to site-packages to install to
+    kwargs = {'subdir': 'gauss2d/fit'}
+endif
+
 module = python.extension_module(
     '_gauss2d_fit', # Name of the module
     sources,  # List of sources
@@ -43,7 +59,7 @@ module = python.extension_module(
         gauss2dfit_dep,
         pybind11_dep,
     ],
-    subdir: 'gauss2d/fit', # Folder relative to site-packages to install to
+    kwargs: kwargs
 )
 
 # Pure Python sources
@@ -52,9 +68,13 @@ python_sources = [
     'utils.py',
 ]
 
-# Install pure Python
-python.install_sources(
-    python_sources,
-    pure: false, # Will be installed next to binaries
-    subdir: 'gauss2d/fit'  # Folder relative to site-packages to install to
-)
+if use_eups
+    install_data(python_sources, kwargs: kwargs)
+else
+    # Install pure Python
+    python.install_sources(
+        python_sources,
+        pure: false, # Will be installed next to binaries
+        subdir: 'gauss2d/fit'  # Folder relative to site-packages to install to
+    )
+endif

python/gauss2d/fit/pybind11.cc

@@ -25,6 +25,9 @@
 
 #include "pybind11.h"
 
+#define STRINGIFY(x) #x
+#define MACRO_STRINGIFY(x) STRINGIFY(x)
+
 /*
  * This structure generates a single module. The only major downside is that
  * abstract types need to be declared in the correct order, so the ordering
@@ -67,4 +70,9 @@ PYBIND11_MODULE(_gauss2d_fit, m) {
     bind_sersicparametricellipse(m);
     bind_shapeprior(m);
     bind_source(m);
+#ifdef VERSION
+    m.attr("__version__") = MACRO_STRINGIFY(VERSION);
+#else
+    m.attr("__version__") = "dev";
+#endif
 }

python/meson.build

@@ -1,12 +1,46 @@
 project(
-    'gauss2d',
+    'gauss2dfit',
     'cpp',
     default_options : ['cpp_std=c++17',],
-    version : '0.1.0',
+    version : run_command('cat', meson.source_root() + '/VERSION', check: true).stdout().strip(),
 )
-gauss2d_dep = dependency('gauss2d')
-gauss2d_python_dep = dependency('gauss2d_python')
-gauss2dfit_dep = dependency('gauss2dfit')
+
+add_project_arguments('-DVERSION=@0@'.format(meson.project_version()), language : 'cpp')
+
+eups = find_program('eups', required: false)
+use_eups = eups.found()
+
+if use_eups
+	gauss2dfit_eups = run_command('eups', 'list', '-d', 'gauss2dfit', check: false)
+	use_eups = gauss2dfit_eups.returncode() == 0
+endif
+
+if use_eups
+    gauss2d_eupsdir = run_command('eups', 'list', '-d', 'gauss2d', check: true).stdout().strip()
+    cpp = meson.get_compiler('cpp')
+    gauss2d_dep = declare_dependency(
+        dependencies: [cpp.find_library('gauss2d', dirs: [gauss2d_eupsdir + '/build-release/lib64']),],
+        include_directories: gauss2d_eupsdir + '/build-release/include',
+    )
+    gauss2d_python_dep = declare_dependency(
+        include_directories: gauss2d_eupsdir + '/python/lib/build-release/include',
+    )
+    gauss2dfit_eupsdir = gauss2dfit_eups.stdout().strip()
+    parameters_eupsdir = run_command('eups', 'list', '-d', 'parameters', check: true).stdout().strip()
+    # TODO: Can this dependency be extracted from '../meson.build' somehow
+    gauss2dfit_dep = declare_dependency(
+        dependencies: [cpp.find_library('gauss2dfit', dirs: [gauss2dfit_eupsdir + '/build-release/lib64']),],
+        include_directories: [
+            gauss2dfit_eupsdir + '/build-release/include',
+            parameters_eupsdir + '/build-release/include',
+        ]
+    )
+else
+    gauss2d_dep = dependency('gauss2d')
+    gauss2d_python_dep = dependency('gauss2d_python')
+    gauss2dfit_dep = dependency('gauss2dfit')
+endif
+
 pybind11_dep = dependency('pybind11')
 pymod = import('python')
 python = pymod.find_installation(
@@ -15,4 +49,17 @@ python = pymod.find_installation(
     modules: ['gauss2d', 'pytest'],
 )
 subdir('gauss2d/fit')
-subdir('tests')
+subdir('tests')
+
+if not use_eups
+	pip_cmd = [
+	    'python', '-m', 'pip', 'install', meson.source_root(),
+	     '-t', python.get_install_dir(),
+	     '--no-dependencies',
+	     '--no-build-isolation',
+	     '--upgrade',
+     ]
+	message('Will run on install:')
+	message(pip_cmd)
+	meson.add_install_script(pip_cmd)
+endif

python/pyproject.toml

@@ -1,19 +1,20 @@
-[tool.poetry]
-name = "gauss2d"
+[project]
+name = "gauss2dfit"
+authors = [
+    {name="Dan Taranu", email="dan.s.taranu@gmail.com"},
+]
+description = "Python (pybind11) bindings for gauss2dfit"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+]
+dependencies = [
+	"gauss2d",
+    "numpy",
+    "pybind11",
+    "pytest",
+]
 version = "0.1.0"
-description = "Python (pybind11) bindings for gauss2d"
-authors = ["taranu <dan.s.taranu@gmail.com>"]
-license = "GPL-3.0-or-later"
-
-[tool.poetry.dependencies]
-python = "^3.7"
-pybind11 = ">2.6.2"
-numpy = ">1.20.2"
-pytest = ">4" 
-
-[tool.poetry.dev-dependencies]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
 
+[tool.setuptools]
+py-modules = []