From b14fb531ad9ae3d565f2cf28f5506408ab10dbed Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 18 Nov 2015 11:26:15 +0100
Subject: Add CompositeGeometryManager

This handles FP and BP operations on multiple data objects at once,
splitting them to fit in GPU memory where necessary.
---
 astra_vc11.vcxproj | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'astra_vc11.vcxproj')

diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj
index bc11b23..fc8b9ce 100644
--- a/astra_vc11.vcxproj
+++ b/astra_vc11.vcxproj
@@ -380,6 +380,7 @@
     <ClCompile Include="src\AsyncAlgorithm.cpp" />
     <ClCompile Include="src\BackProjectionAlgorithm.cpp" />
     <ClCompile Include="src\CglsAlgorithm.cpp" />
+    <ClCompile Include="src\CompositeGeometryManager.cpp" />
     <ClCompile Include="src\ConeProjectionGeometry3D.cpp" />
     <ClCompile Include="src\ConeVecProjectionGeometry3D.cpp" />
     <ClCompile Include="src\Config.cpp" />
@@ -582,6 +583,7 @@
     <ClInclude Include="cuda\3d\darthelper3d.h" />
     <ClInclude Include="cuda\3d\dims3d.h" />
     <ClInclude Include="cuda\3d\fdk.h" />
+    <ClInclude Include="cuda\3d\mem3d.h" />
     <ClInclude Include="cuda\3d\par3d_bp.h" />
     <ClInclude Include="cuda\3d\par3d_fp.h" />
     <ClInclude Include="cuda\3d\sirt3d.h" />
@@ -594,6 +596,7 @@
     <ClInclude Include="include\astra\AsyncAlgorithm.h" />
     <ClInclude Include="include\astra\BackProjectionAlgorithm.h" />
     <ClInclude Include="include\astra\CglsAlgorithm.h" />
+    <ClInclude Include="include\astra\CompositeGeometryManager.h" />
     <ClInclude Include="include\astra\ConeProjectionGeometry3D.h" />
     <ClInclude Include="include\astra\ConeVecProjectionGeometry3D.h" />
     <ClInclude Include="include\astra\Config.h" />
@@ -804,6 +807,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CudaCompile>
+    <CudaCompile Include="cuda\3d\mem3d.cu">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CudaCompile>
     <CudaCompile Include="cuda\3d\par3d_bp.cu">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-- 
cgit v1.2.3


From 0d015b1c91581ee5ef3e936f03e4c62fbc7ea362 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 4 Dec 2015 16:34:44 +0100
Subject: Update Windows build files

---
 astra_vc11.vcxproj | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'astra_vc11.vcxproj')

diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj
index fc8b9ce..d050b96 100644
--- a/astra_vc11.vcxproj
+++ b/astra_vc11.vcxproj
@@ -540,6 +540,7 @@
     <ClCompile Include="src\ParallelProjectionGeometry3D.cpp" />
     <ClCompile Include="src\ParallelVecProjectionGeometry3D.cpp" />
     <ClCompile Include="src\PlatformDepSystemCode.cpp" />
+    <ClCompile Include="src\PluginAlgorithm.cpp" />
     <ClCompile Include="src\ProjectionGeometry2D.cpp" />
     <ClCompile Include="src\ProjectionGeometry3D.cpp" />
     <ClCompile Include="src\Projector2D.cpp" />
@@ -652,6 +653,7 @@
     <ClInclude Include="include\astra\ParallelProjectionGeometry3D.h" />
     <ClInclude Include="include\astra\ParallelVecProjectionGeometry3D.h" />
     <ClInclude Include="include\astra\PlatformDepSystemCode.h" />
+    <ClInclude Include="include\astra\PluginAlgorithm.h" />
     <ClInclude Include="include\astra\ProjectionGeometry2D.h" />
     <ClInclude Include="include\astra\ProjectionGeometry3D.h" />
     <ClInclude Include="include\astra\Projector2D.h" />
-- 
cgit v1.2.3