From 6abb84ef7f223b9a2bb1502935bb86d20f7f5277 Mon Sep 17 00:00:00 2001 From: Mario Fink Date: Fri, 26 Apr 2019 16:12:56 +0200 Subject: [PATCH] fixed language_level and edit makefile --- example.py | 12 ++++-------- makefile | 5 +---- pytdm_ripper.pyx | 2 -- tdm_ripper.pxd | 3 +++ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/example.py b/example.py index bfdecce..45fa4d1 100644 --- a/example.py +++ b/example.py @@ -32,13 +32,9 @@ print("\n\n") print(channels[0:40]) x = np.linspace(0,Nlen,Nlen) -plt.plot(x,channels[0:1000]) -plt.plot(x,channels[1000:2000]) -plt.plot(x,channels[2000:3000]) -plt.plot(x,channels[3000:4000]) -plt.plot(x,channels[4000:5000]) -plt.plot(x,channels[5000:6000]) -plt.plot(x,channels[6000:7000]) -plt.plot(x,channels[7000:8000]) +plt.plot(x,channels[0:Nlen]) +plt.plot(x,channels[Nlen:2*Nlen]) +plt.plot(x,channels[2*Nlen:3*Nlen]) + plt.grid() plt.show() diff --git a/makefile b/makefile index b6dffaf..caf5fe2 100644 --- a/makefile +++ b/makefile @@ -17,10 +17,7 @@ tdm_ripper.o : lib/tdm_ripper.cpp lib/tdm_ripper.hpp clean : rm -f $(EXE) *.o -newlib : - g++ -bundle -undefined dynamic_lookup -L/anaconda3/lib -arch x86_64 -L/anaconda3/lib -arch x86_64 -arch x86_64 build/temp.macosx-10.7-x86_64-3.7/pytdm_ripper.o -Llib -o /Users/mariofink/Desktop/tdm_tdx/tdm_ripper/pytdm_ripper.cpython-37m-darwin.so - -pylib : setup.py pytdm_ripper.pyx tdm_ripper.pxd +pylib : setup.py pytdm_ripper.pyx tdm_ripper.pxd tdm_ripper.o python3 setup.py build_ext --inplace lib/libtdmripper.a : diff --git a/pytdm_ripper.pyx b/pytdm_ripper.pyx index e0f5498..efe3ac2 100644 --- a/pytdm_ripper.pyx +++ b/pytdm_ripper.pyx @@ -1,5 +1,3 @@ -# cython: language_level = 3 -# distutils: language = c++ from tdm_ripper cimport tdm_ripper import numpy as np diff --git a/tdm_ripper.pxd b/tdm_ripper.pxd index 011dc6f..51da4de 100644 --- a/tdm_ripper.pxd +++ b/tdm_ripper.pxd @@ -1,3 +1,6 @@ +# cython: language_level = 3 +# distutils: language = c++ + # use some C++ STL libraries from libcpp.string cimport string from libcpp.vector cimport vector