fixes

sibyl-team · Sep 26, 2023 · e19932c · e19932c
1 parent 09c6929
commit e19932c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,10 @@
 PYTHON=python3
+PYTHON_CONFIG=python3-config
 INC=-Ilib -I${CONDA_PREFIX}/include
 EXTRA=-O3
 VERSION=$(shell git show -s --pretty="%h %ad %d")
 CFLAGS=-fPIC -std=c++11 -Wall -g -fopenmp ${INC}
-SO=_sib$(shell ${PYTHON}-config --extension-suffix)
+SO=_sib$(shell ${PYTHON_CONFIG} --extension-suffix)
 LINK=-lgomp -lm -DVERSION="\"${VERSION}\""
 PYINC=$(shell ${PYTHON} -m pybind11 --includes)
 DEP=$(wildcard *.h)

diff --git a/test/data_load.py b/test/data_load.py
@@ -28,7 +28,7 @@ def save_json(obj,file_,indent=1):
 ALL_EPI = "all_epidemies"
 
 NAMES_COLS_CONTACTS = ["t","i","j","lambda"]
-CONTACTS_DTYPES = dict(zip(NAMES_COLS_CONTACTS,(np.int,np.int,np.int,np.float) ))
+CONTACTS_DTYPES = dict(zip(NAMES_COLS_CONTACTS,(int,int,int,float) ))