fixes for JetPack 4

st6io · Jun 20, 2024 · 903fae3 · 903fae3
1 parent dac4f06
commit 903fae3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/python/bindings/PyCUDA.cpp b/python/bindings/PyCUDA.cpp
@@ -1419,7 +1419,7 @@ PyObject* PyCUDA_StreamWaitEvent( PyObject* self, PyObject* args )
 	if( !PyArg_ParseTuple(args, "KK", &stream, &event) )
 		return NULL;
 
-    PYCUDA_ASSERT(cudaStreamWaitEvent(stream, event));
+    PYCUDA_ASSERT(cudaStreamWaitEvent(stream, event, 0));
 
     Py_RETURN_NONE;
 }

diff --git a/python/bindings/PyUtils.h b/python/bindings/PyUtils.h
@@ -40,14 +40,14 @@
 	#define PYTHON_3
 	#endif
 
-	#define PYLONG_AS_LONG(x)				PyLong_AsLong(x)
-	#define PYLONG_FROM_LONG(x)				PyLong_FromLong(x)
+	#define PYLONG_AS_LONG(x)				    PyLong_AsLong(x)
+	#define PYLONG_FROM_LONG(x)				    PyLong_FromLong(x)
 	#define PYLONG_FROM_UNSIGNED_LONG(x)		PyLong_FromUnsignedLong(x)
 	#define PYLONG_FROM_UNSIGNED_LONG_LONG(x) 	PyLong_FromUnsignedLongLong(x)
     #define PYLONG_FROM_PTR(x)                  PyLong_FromUnsignedLongLong((uint64_t)x)
 
-	#define PYSTRING_CHECK					PyUnicode_Check
-	#define PYSTRING_AS_STRING				PyUnicode_AsUTF8
+	#define PYSTRING_CHECK					    PyUnicode_Check
+	#define PYSTRING_AS_STRING				    PyUnicode_AsUTF8
 	#define PYSTRING_FROM_STRING				PyUnicode_FromString
 	#define PYSTRING_FROM_FORMAT				PyUnicode_FromFormat
 
@@ -58,13 +58,14 @@
 	#define PYTHON_2
 	#endif
 
-	#define PYLONG_AS_LONG(x)				PyInt_AsLong(x)
-	#define PYLONG_FROM_LONG(x)				PyInt_FromLong(x)
-	#define PYLONG_FROM_UNSIGNED_LONG(x)		PyInt_FromLong(x)
-	#define PYLONG_FROM_UNSIGNED_LONG_LONG(x)	PyInt_FromLong((long)x)
-
-	#define PYSTRING_CHECK					PyString_Check
-	#define PYSTRING_AS_STRING				PyString_AsString
+	#define PYLONG_AS_LONG(x)				    PyInt_AsLong(x)
+	#define PYLONG_FROM_LONG(x)				    PyInt_FromLong(x)
+	#define PYLONG_FROM_UNSIGNED_LONG(x)		PyLong_FromUnsignedLong(x)
+	#define PYLONG_FROM_UNSIGNED_LONG_LONG(x)	PyLong_FromUnsignedLongLong((long)x)
+    #define PYLONG_FROM_PTR(x)                  PyLong_FromUnsignedLongLong((uint64_t)x)
+
+	#define PYSTRING_CHECK					    PyString_Check
+	#define PYSTRING_AS_STRING				    PyString_AsString
 	#define PYSTRING_FROM_STRING				PyString_FromString
 	#define PYSTRING_FROM_FORMAT				PyString_FromFormat