Add astra as submodule

jtschwar · Aug 10, 2022 · 895fa65 · 895fa65
1 parent ac7de18
commit 895fa65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "thirdparty/eigen"]
 	path = thirdparty/eigen
 	url = https://gitlab.com/libeigen/eigen.git
+[submodule "thirdparty/astra-toolbox"]
+	path = thirdparty/astra-toolbox
+	url = https://github.com/jtschwar/astra-toolbox.git
diff --git a/gpu_3D/Utils/Makefile b/gpu_3D/Utils/Makefile
@@ -7,7 +7,9 @@ MPIGPUCONFIG = mpi_astra_ctvlib`python3-config --extension-suffix`
 
 all: shared_library astra_ctvlib mpi_astra_ctvlib  
 
-shared_library: 
+shared_library:
+	cd container; make; cd ..
+	cd regularizers; make; cd .. 
 	g++ -shared container/*.o regularizers/*.o -o aux_func.so
 
 astra_ctvlib: astra_ctvlib.cpp astra_ctvlib.hpp

diff --git a/thirdparty/astra-toolbox b/thirdparty/astra-toolbox