From 23e399366c8e4e78b00c9f1cd13030085629865f Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 12 Apr 2021 09:04:03 -0400
Subject: [PATCH 1/2] python3Packages.cvxpy: 1.1.11 -> 1.1.12
---
pkgs/development/python-modules/cvxpy/default.nix | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index eca28633aaf4..fab4ee0fc274 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, pythonOlder
, buildPythonPackage
, fetchPypi
@@ -14,13 +15,14 @@
buildPythonPackage rec {
pname = "cvxpy";
- version = "1.1.11";
+ version = "1.1.12";
+ format = "pyproject";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- hash = "sha256-W4qly+g07Q1iYJ76/tGZNkBPa+oavhTDUYRQ3cZ+s1I=";
+ hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc=";
};
propagatedBuildInputs = [
@@ -38,6 +40,8 @@ buildPythonPackage rec {
disabledTests = [
"test_tv_inpainting"
"test_diffcp_sdp_example"
+ ] ++ lib.optionals stdenv.isAarch64 [
+ "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155
];
meta = with lib; {
From e44319a3e6c852c86090e3c840a209af20ee9656 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 12 Apr 2021 11:41:37 -0400
Subject: [PATCH 2/2] python3Packages.cvxpy: add openmp multithreading
---
pkgs/development/python-modules/cvxpy/default.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index fab4ee0fc274..1d060c41bb21 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -9,6 +9,7 @@
, osqp
, scipy
, scs
+, useOpenmp ? true
# Check inputs
, pytestCheckHook
}:
@@ -34,6 +35,12 @@ buildPythonPackage rec {
scs
];
+ # Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11
+ preBuild = lib.optional useOpenmp ''
+ export CFLAGS="-fopenmp"
+ export LDFLAGS="-lgomp"
+ '';
+
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "./cvxpy" ];
# Disable the slowest benchmarking tests, cuts test time in half