Skip to content

Commit f24890d

Browse files
committed
[GR-66033] Improve torch GPU memory management
PullRequest: graalpython/3844
2 parents 6727bb1 + d60685b commit f24890d

File tree

13 files changed

+332
-1461
lines changed

13 files changed

+332
-1461
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCEvalBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
4545
import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
4646
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
47-
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyFrameObjectTransfer;
47+
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyFrameObjectBorrowed;
4848
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
4949
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
5050
import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectConstPtr;
@@ -136,7 +136,7 @@ Object release(
136136
}
137137
}
138138

139-
@CApiBuiltin(ret = PyFrameObjectTransfer, args = {}, call = Direct)
139+
@CApiBuiltin(ret = PyFrameObjectBorrowed, args = {}, call = Direct)
140140
abstract static class PyEval_GetFrame extends CApiNullaryBuiltinNode {
141141
@Specialization
142142
Object getFrame(

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/ArgDescriptor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ public enum ArgDescriptor {
220220
PyFunctionObject(ArgBehavior.PyObject, "PyFunctionObject*"),
221221
PyFrameConstructor("PyFrameConstructor*"),
222222
PyFrameObject(ArgBehavior.PyObject, "PyFrameObject*"),
223+
PyFrameObjectBorrowed(ArgBehavior.PyObjectBorrowed, "PyFrameObject*"),
223224
PyFrameObjectTransfer(ArgBehavior.PyObject, "PyFrameObject*", true),
224225
_PyFrameEvalFunction("_PyFrameEvalFunction"),
225226
_PyInterpreterFrame("struct _PyInterpreterFrame*"),

graalpython/lib-graalpython/patches/metadata.toml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -356,21 +356,9 @@ license = 'BSD-3-Clause'
356356
dist-type = 'sdist'
357357

358358
[[numpy.rules]]
359-
version = '== 1.24.3'
360-
patch = 'numpy-1.24.3.patch'
361-
license = 'BSD-3-Clause'
362-
dist-type = 'sdist'
363-
364-
[[numpy.rules]]
365-
version = '== 1.23.5'
366-
patch = 'numpy-1.23.5.patch'
367-
license = 'BSD-3-Clause'
368-
dist-type = 'sdist'
369-
370-
[[numpy.rules]]
371-
# 1.23.2 is currently used by oldest-supported-numpy
372-
version = '>= 1.23.2, < 1.23.5'
373-
patch = 'numpy-1.23.2.patch'
359+
# 1.26.2 is currently used by oldest-supported-numpy
360+
version = '== 1.26.2'
361+
patch = 'numpy-1.26.2.patch'
374362
license = 'BSD-3-Clause'
375363
dist-type = 'sdist'
376364

graalpython/lib-graalpython/patches/numpy-1.23.2.patch

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)