fixed higher-level again

davidfrantz · Nov 28, 2024 · c2587a9 · c2587a9
1 parent 9373970
commit c2587a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/misc/force-version.txt b/misc/force-version.txt
@@ -1 +1 @@
-3.7.12-dev:::2024-10-31_11:57:59
+3.7.12-dev:::2024-11-28_07:52:29
diff --git a/src/modules/higher-level/py-udf-hl.c b/src/modules/higher-level/py-udf-hl.c
@@ -61,7 +61,7 @@ int date_from_bandname(date_t *date, char *bandname);
 --- phl:    HL parameters
 +++ Return: void
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++**/
-void register_python(par_hl_t *phl){
+int register_python(par_hl_t *phl){
 par_udf_t *udf;
 
 
@@ -75,17 +75,12 @@ par_udf_t *udf;
   } else if (phl->udf.pyp.out){
     udf = &phl->udf.pyp;
   } else {
-    exit(FAILURE);
+    return(CANCEL);
   }
 
-
   Py_Initialize();
 
-  if (_import_array() < 0) {
-    PyErr_Print();
-    PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
-    exit(FAILURE);
-  }
+  import_array();
 
   PyRun_SimpleString("from multiprocessing.pool import Pool");
   PyRun_SimpleString("import numpy as np");
@@ -185,7 +180,7 @@ par_udf_t *udf;
   printf("finished to register python interface\n");
   #endif
 
-  return;
+  return SUCCESS;
 }
 
 

diff --git a/src/modules/higher-level/py-udf-hl.h b/src/modules/higher-level/py-udf-hl.h
@@ -39,7 +39,7 @@ Python UDF plug-in header
 extern "C" {
 #endif
 
-void register_python(par_hl_t *phl);
+int register_python(par_hl_t *phl);
 void deregister_python(par_hl_t *phl);
 void init_pyp(ard_t *ard, tsa_t *ts, int submodule, char *idx_name, int nb, int nt, par_udf_t *udf);
 void term_pyp(par_udf_t *udf);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3.7.12-dev:::2024-10-31_11:57:59
		3.7.12-dev:::2024-11-28_07:52:29