Unverified Commit 2adbe4cf authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.gpytorch: fix build (#493846)

parents c7677516 21d3a887
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@
  pythonAtLeast,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "botorch";
  version = "0.16.1";
  version = "0.17.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "meta-pytorch";
    repo = "botorch";
    tag = "v${version}";
    hash = "sha256-8tmNw1Qa3lXxvndljRijGNN5RMjsYlT8zFFau23yp1U=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-NDdXsmVdrTEXMXXVf89EkGXVOYnEcXwtzarB5niTNaw=";
  };

  build-system = [
@@ -102,10 +102,10 @@ buildPythonPackage rec {
  requiredSystemFeatures = [ "big-parallel" ];

  meta = {
    changelog = "https://github.com/meta-pytorch/botorch/blob/${src.tag}/CHANGELOG.md";
    changelog = "https://github.com/meta-pytorch/botorch/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    description = "Bayesian Optimization in PyTorch";
    homepage = "https://botorch.org";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ veprbl ];
  };
}
})
+12 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
  pytestCheckHook,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "gpytorch";
  version = "1.15.1";
  pyproject = true;
@@ -28,10 +28,18 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "cornellius-gp";
    repo = "gpytorch";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-ftiAY02K0EwVQZufk8xR+/21A+2ONWchuWPF3a5lRW0=";
  };

  # AttributeError: module 'numpy' has no attribute 'trapz'
  postPatch = ''
    substituteInPlace gpytorch/kernels/spectral_mixture_kernel.py \
      --replace-fail \
        "np.trapz(emp_spect, freq)" \
        "np.trapezoid(emp_spect, freq)"
  '';

  build-system = [
    setuptools
    setuptools-scm
@@ -73,8 +81,8 @@ buildPythonPackage rec {
    description = "Highly efficient and modular implementation of Gaussian Processes, with GPU acceleration";
    homepage = "https://gpytorch.ai";
    downloadPage = "https://github.com/cornellius-gp/gpytorch";
    changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${src.tag}";
    changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ veprbl ];
  };
}
})
+10 −22
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
  ray,
  writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "syne-tune";
  version = "0.15.0";
  pyproject = true;
@@ -44,17 +44,10 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "syne-tune";
    repo = "syne-tune";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-UNBpfC+aLXhkbyvCG2K00yedJnpYpfldqisZ/wDPtuA=";
  };

  postPatch = ''
    substituteInPlace syne_tune/optimizer/schedulers/synchronous/hyperband.py \
     --replace-fail 'metric_val=np.NAN' 'metric_val=np.nan'
    substituteInPlace syne_tune/optimizer/schedulers/synchronous/dehb.py \
     --replace-fail 'result_failed.metric_val = np.NAN' 'result_failed.metric_val = np.nan'
  '';

  build-system = [
    setuptools
  ];
@@ -108,12 +101,12 @@ buildPythonPackage rec {
    writableTmpDirAsHomeHook
  ]
  ++ ray.optional-dependencies.tune
  ++ optional-dependencies.blackbox-repository
  ++ optional-dependencies.bore
  ++ optional-dependencies.botorch
  ++ optional-dependencies.gpsearchers
  ++ optional-dependencies.kde
  ++ optional-dependencies.sklearn;
  ++ finalAttrs.passthru.optional-dependencies.blackbox-repository
  ++ finalAttrs.passthru.optional-dependencies.bore
  ++ finalAttrs.passthru.optional-dependencies.botorch
  ++ finalAttrs.passthru.optional-dependencies.gpsearchers
  ++ finalAttrs.passthru.optional-dependencies.kde
  ++ finalAttrs.passthru.optional-dependencies.sklearn;

  disabledTests = [
    # NameError: name 'HV' is not defined
@@ -129,11 +122,6 @@ buildPythonPackage rec {
    "test_cholesky_factorization"
  ];

  disabledTestPaths = [
    # legacy test
    "tst/schedulers/test_legacy_schedulers_api.py"
  ];

  pythonImportsCheck = [
    "syne_tune"
  ];
@@ -141,8 +129,8 @@ buildPythonPackage rec {
  meta = {
    description = "Large scale asynchronous hyperparameter and architecture optimization library";
    homepage = "https://github.com/syne-tune/syne-tune";
    changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${src.tag}";
    changelog = "https://github.com/syne-tune/syne-tune/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ daspk04 ];
  };
}
})