Skip to content

Commit 6e74923

Browse files
committed
[GR-54884] Pin numpy 1 in torch 1 patch
PullRequest: graalpython/3377
2 parents 5278b4b + 47ba525 commit 6e74923

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
#define HAVE_WCHAR_H 1
166166

167167
#define WITH_THREAD 1
168+
#define WITH_DOC_STRINGS 1
168169

169170
#ifndef MS_WINDOWS
170171
#define HAVE_UNISTD_H

graalpython/lib-graalpython/patches/onnxruntime/onnxruntime-1.17.1.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,18 @@ index 97515cb..143790d 100644
8989
[tool.black]
9090
line-length = 120
9191
# NOTE: Do not extend the exclude list. Edit .lintrunner.toml instead
92+
diff --git a/requirements.txt.in b/requirements.txt.in
93+
index 8924206..a9c1327 100644
94+
--- a/requirements.txt.in
95+
+++ b/requirements.txt.in
96+
@@ -1,6 +1,6 @@
97+
coloredlogs
98+
flatbuffers
99+
-numpy >= @Python_NumPy_VERSION@
100+
+numpy
101+
packaging
102+
protobuf
103+
sympy
92104
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
93105
index 31f242c..300211b 100644
94106
--- a/tools/ci_build/build.py

graalpython/lib-graalpython/patches/torch/metadata.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
version = '== 1.13.1'
33
patch = 'torch-1.13.1.patch'
44
dist-type = 'sdist'
5-
install-priority = 2
65

76
[[rules]]
87
version = '== 2.2.1'

graalpython/lib-graalpython/patches/torch/torch-1.13.1.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,19 @@ index 9bab33b6..4f235d66 100644
8989
return Slice<py::handle>((py::handle*)begin, (py::handle*) (begin + tv.size()));
9090
}
9191

92+
diff --git a/pyproject.toml b/pyproject.toml
93+
index 827c03b8..36893a76 100644
94+
--- a/pyproject.toml
95+
+++ b/pyproject.toml
96+
@@ -3,7 +3,7 @@ requires = [
97+
"setuptools",
98+
"wheel",
99+
"astunparse",
100+
- "numpy",
101+
+ "numpy<2",
102+
"ninja",
103+
"pyyaml",
104+
"setuptools",
92105
diff --git a/setup.py b/setup.py
93106
index 2ef8b7f2..1f4efd70 100644
94107
--- a/setup.py

0 commit comments

Comments
 (0)