From e19932c45abc1129df81365493618212ed0af5fb Mon Sep 17 00:00:00 2001 From: Alfredo Braunstein Date: Tue, 26 Sep 2023 15:17:35 +0200 Subject: [PATCH] fixes --- Makefile | 3 ++- test/data_load.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fcfcc75..425a13f 100644 --- 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 index b2fbc88..861a58d 100644 --- 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) ))