diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-06 20:55:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-06 20:55:01 +0200 |
commit | 901ff63f9c2a39b34c1de6c278240291c317a447 (patch) | |
tree | 9e8016a19998e5d7c94c6168dc6a9de03212f24d | |
parent | 00a248e2ab129061c62732bbfb5c106c2fdcd2de (diff) | |
parent | 659b429eedda55f7ca8d0953b3d9e4366ccb8456 (diff) |
Merge pull request #309351 from atorres1985-contrib/openturns
Openturns: fixup and refactor
-rw-r--r-- | pkgs/by-name/op/openturns/package.nix | 99 | ||||
-rw-r--r-- | pkgs/development/libraries/openturns/default.nix | 82 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 99 insertions, 86 deletions
diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix new file mode 100644 index 0000000000000..152714133fa7a --- /dev/null +++ b/pkgs/by-name/op/openturns/package.nix @@ -0,0 +1,99 @@ +{ + lib, + boost, + ceres-solver, + cmake, + cminpack, + darwin, + dlib, + fetchFromGitHub, + fetchpatch, + hdf5, + hmat-oss, + ipopt, + libxml2, + nlopt, + pagmo2, + primesieve, + python3Packages, + spectra, + stdenv, + swig, + tbb, + # Boolean flags + runTests ? false, # tests take an hour to build on a 48-core machine + enablePython ? false, +}: + +let + inherit (darwin.apple_sdk.frameworks) Accelerate; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openturns"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "openturns"; + repo = "openturns"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; + }; + + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals enablePython [ python3Packages.sphinx ]; + + buildInputs = [ + (lib.getLib primesieve) + boost + ceres-solver + cminpack + dlib + hdf5 + hmat-oss + ipopt + libxml2 + nlopt + pagmo2 + spectra + swig + tbb + ] + ++ lib.optionals enablePython [ + python3Packages.dill + python3Packages.matplotlib + python3Packages.psutil + python3Packages.python + ] + ++ lib.optionals stdenv.isDarwin [ + Accelerate + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON" enablePython) + (lib.cmakeBool "CMAKE_UNITY_BUILD" true) + (lib.cmakeBool "USE_SPHINX" enablePython) + (lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32") + (lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1") + (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc") + ]; + + checkTarget = lib.concatStringsSep " " [ + "tests" + "check" + ]; + + strictDeps = true; + + doCheck = runTests; + + meta = { + homepage = "https://openturns.github.io/www/"; + description = "Multivariate probabilistic modeling and uncertainty treatment library"; + changelog = "https://github.com/openturns/openturns/raw/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; + maintainers = with lib.maintainers; [ gdinh ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix deleted file mode 100644 index a2fa42caea609..0000000000000 --- a/pkgs/development/libraries/openturns/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, swig -, boost -, spectra -, libxml2 -, tbb -, hmat-oss -, nlopt -, cminpack -, ceres-solver -, dlib -, hdf5 -, primesieve -, pagmo2 -, ipopt -, Accelerate -# tests take an hour to build on a 48-core machine -, runTests ? false -, enablePython ? false -, python3Packages -}: - -stdenv.mkDerivation rec { - pname = "openturns"; - version = "1.22"; - - src = fetchFromGitHub { - owner = "openturns"; - repo = "openturns"; - rev = "v${version}"; - sha256 = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; - }; - - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; - buildInputs = [ - swig - boost - spectra - libxml2 - tbb - hmat-oss - nlopt - cminpack - ceres-solver - dlib - hdf5 - primesieve - pagmo2 - ipopt - ] ++ lib.optionals enablePython [ - python3Packages.python - python3Packages.matplotlib - python3Packages.psutil - python3Packages.dill - ] ++ lib.optional stdenv.isDarwin Accelerate; - - cmakeFlags = [ - "-DOPENTURNS_SYSCONFIG_PATH=$out/etc" - "-DCMAKE_UNITY_BUILD=ON" - "-DCMAKE_UNITY_BUILD_BATCH_SIZE=32" - "-DSWIG_COMPILE_FLAGS='-O1'" - "-DUSE_SPHINX=${if enablePython then "ON" else "OFF"}" - "-DBUILD_PYTHON=${if enablePython then "ON" else "OFF"}" - ]; - - doCheck = runTests; - - checkTarget = "tests check"; - - meta = with lib; { - description = "Multivariate probabilistic modeling and uncertainty treatment library"; - license = with licenses; [ lgpl3 gpl3 ]; - homepage = "https://openturns.github.io/www/"; - changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ gdinh ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f2f6ab108c09..fdbb8ac7ff6aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23803,10 +23803,6 @@ with pkgs; opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; - open-wbo = callPackage ../applications/science/logic/open-wbo { }; openwsman = callPackage ../development/libraries/openwsman { }; |