Sync MSVC project

3 files changed, 93 insertions, 93 deletions

diff --git a/astra_vc14.vcxproj b/astra_vc14.vcxproj
index cd91065..64c08ee 100644
--- a/astra_vc14.vcxproj
+++ b/astra_vc14.vcxproj
@@ -556,37 +556,6 @@
     <ClCompile Include="src\XMLNode.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cuda\2d\algo.h" />
-    <ClInclude Include="cuda\2d\arith.h" />
-    <ClInclude Include="cuda\2d\astra.h" />
-    <ClInclude Include="cuda\2d\cgls.h" />
-    <ClInclude Include="cuda\2d\darthelper.h" />
-    <ClInclude Include="cuda\2d\dims.h" />
-    <ClInclude Include="cuda\2d\em.h" />
-    <ClInclude Include="cuda\2d\fan_bp.h" />
-    <ClInclude Include="cuda\2d\fan_fp.h" />
-    <ClInclude Include="cuda\2d\fbp.h" />
-    <ClInclude Include="cuda\2d\fbp_filters.h" />
-    <ClInclude Include="cuda\2d\fft.h" />
-    <ClInclude Include="cuda\2d\par_bp.h" />
-    <ClInclude Include="cuda\2d\par_fp.h" />
-    <ClInclude Include="cuda\2d\sart.h" />
-    <ClInclude Include="cuda\2d\sirt.h" />
-    <ClInclude Include="cuda\2d\util.h" />
-    <ClInclude Include="cuda\3d\algo3d.h" />
-    <ClInclude Include="cuda\3d\arith3d.h" />
-    <ClInclude Include="cuda\3d\astra3d.h" />
-    <ClInclude Include="cuda\3d\cgls3d.h" />
-    <ClInclude Include="cuda\3d\cone_bp.h" />
-    <ClInclude Include="cuda\3d\cone_fp.h" />
-    <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" />
-    <ClInclude Include="cuda\3d\util3d.h" />
     <ClInclude Include="include\astra\Algorithm.h" />
     <ClInclude Include="include\astra\AlgorithmTypelist.h" />
     <ClInclude Include="include\astra\ArtAlgorithm.h" />
@@ -677,6 +646,37 @@
     <ClInclude Include="include\astra\XMLDocument.h" />
     <ClInclude Include="include\astra\XMLNode.h" />
     <ClInclude Include="include\astra\clog.h" />
+    <ClInclude Include="include\astra\cuda\2d\algo.h" />
+    <ClInclude Include="include\astra\cuda\2d\arith.h" />
+    <ClInclude Include="include\astra\cuda\2d\astra.h" />
+    <ClInclude Include="include\astra\cuda\2d\cgls.h" />
+    <ClInclude Include="include\astra\cuda\2d\darthelper.h" />
+    <ClInclude Include="include\astra\cuda\2d\dims.h" />
+    <ClInclude Include="include\astra\cuda\2d\em.h" />
+    <ClInclude Include="include\astra\cuda\2d\fan_bp.h" />
+    <ClInclude Include="include\astra\cuda\2d\fan_fp.h" />
+    <ClInclude Include="include\astra\cuda\2d\fbp.h" />
+    <ClInclude Include="include\astra\cuda\2d\fbp_filters.h" />
+    <ClInclude Include="include\astra\cuda\2d\fft.h" />
+    <ClInclude Include="include\astra\cuda\2d\par_bp.h" />
+    <ClInclude Include="include\astra\cuda\2d\par_fp.h" />
+    <ClInclude Include="include\astra\cuda\2d\sart.h" />
+    <ClInclude Include="include\astra\cuda\2d\sirt.h" />
+    <ClInclude Include="include\astra\cuda\2d\util.h" />
+    <ClInclude Include="include\astra\cuda\3d\algo3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\arith3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\astra3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\cgls3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\cone_bp.h" />
+    <ClInclude Include="include\astra\cuda\3d\cone_fp.h" />
+    <ClInclude Include="include\astra\cuda\3d\darthelper3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\dims3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\fdk.h" />
+    <ClInclude Include="include\astra\cuda\3d\mem3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\par3d_bp.h" />
+    <ClInclude Include="include\astra\cuda\3d\par3d_fp.h" />
+    <ClInclude Include="include\astra\cuda\3d\sirt3d.h" />
+    <ClInclude Include="include\astra\cuda\3d\util3d.h" />
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="cuda\2d\algo.cu">
diff --git a/astra_vc14.vcxproj.filters b/astra_vc14.vcxproj.filters
index 24c54ec..3e9ff9a 100644
--- a/astra_vc14.vcxproj.filters
+++ b/astra_vc14.vcxproj.filters
@@ -611,97 +611,97 @@
     <ClInclude Include="include\astra\Float32VolumeData3DGPU.h">
       <Filter>CUDA\astra headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\algo.h">
+    <ClInclude Include="include\astra\cuda\2d\algo.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\arith.h">
+    <ClInclude Include="include\astra\cuda\2d\arith.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\astra.h">
+    <ClInclude Include="include\astra\cuda\2d\astra.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\cgls.h">
+    <ClInclude Include="include\astra\cuda\2d\cgls.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\darthelper.h">
+    <ClInclude Include="include\astra\cuda\2d\darthelper.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\dims.h">
+    <ClInclude Include="include\astra\cuda\2d\dims.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\em.h">
+    <ClInclude Include="include\astra\cuda\2d\em.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\fan_bp.h">
+    <ClInclude Include="include\astra\cuda\2d\fan_bp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\fan_fp.h">
+    <ClInclude Include="include\astra\cuda\2d\fan_fp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\fbp_filters.h">
+    <ClInclude Include="include\astra\cuda\2d\fbp_filters.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\fbp.h">
+    <ClInclude Include="include\astra\cuda\2d\fbp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\fft.h">
+    <ClInclude Include="include\astra\cuda\2d\fft.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\par_bp.h">
+    <ClInclude Include="include\astra\cuda\2d\par_bp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\par_fp.h">
+    <ClInclude Include="include\astra\cuda\2d\par_fp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\sart.h">
+    <ClInclude Include="include\astra\cuda\2d\sart.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\sirt.h">
+    <ClInclude Include="include\astra\cuda\2d\sirt.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\2d\util.h">
+    <ClInclude Include="include\astra\cuda\2d\util.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\algo3d.h">
+    <ClInclude Include="include\astra\cuda\3d\algo3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\arith3d.h">
+    <ClInclude Include="include\astra\cuda\3d\arith3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\astra3d.h">
+    <ClInclude Include="include\astra\cuda\3d\astra3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\cgls3d.h">
+    <ClInclude Include="include\astra\cuda\3d\cgls3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\cone_bp.h">
+    <ClInclude Include="include\astra\cuda\3d\cone_bp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\cone_fp.h">
+    <ClInclude Include="include\astra\cuda\3d\cone_fp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\darthelper3d.h">
+    <ClInclude Include="include\astra\cuda\3d\darthelper3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\dims3d.h">
+    <ClInclude Include="include\astra\cuda\3d\dims3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\fdk.h">
+    <ClInclude Include="include\astra\cuda\3d\fdk.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\mem3d.h">
+    <ClInclude Include="include\astra\cuda\3d\mem3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\par3d_bp.h">
+    <ClInclude Include="include\astra\cuda\3d\par3d_bp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\par3d_fp.h">
+    <ClInclude Include="include\astra\cuda\3d\par3d_fp.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\sirt3d.h">
+    <ClInclude Include="include\astra\cuda\3d\sirt3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
-    <ClInclude Include="cuda\3d\util3d.h">
+    <ClInclude Include="include\astra\cuda\3d\util3d.h">
       <Filter>CUDA\cuda headers</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index 771c226..fcc12d2 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -283,37 +283,37 @@ P_astra["filters"]["CUDA\\astra source"] = [
 ]
 P_astra["filters"]["CUDA\\cuda headers"] = [
 "4e17872e-db7d-41bc-9760-fad1c253b583",
-"cuda\\2d\\algo.h",
-"cuda\\2d\\arith.h",
-"cuda\\2d\\astra.h",
-"cuda\\2d\\cgls.h",
-"cuda\\2d\\darthelper.h",
-"cuda\\2d\\dims.h",
-"cuda\\2d\\em.h",
-"cuda\\2d\\fan_bp.h",
-"cuda\\2d\\fan_fp.h",
-"cuda\\2d\\fbp_filters.h",
-"cuda\\2d\\fbp.h",
-"cuda\\2d\\fft.h",
-"cuda\\2d\\par_bp.h",
-"cuda\\2d\\par_fp.h",
-"cuda\\2d\\sart.h",
-"cuda\\2d\\sirt.h",
-"cuda\\2d\\util.h",
-"cuda\\3d\\algo3d.h",
-"cuda\\3d\\arith3d.h",
-"cuda\\3d\\astra3d.h",
-"cuda\\3d\\cgls3d.h",
-"cuda\\3d\\cone_bp.h",
-"cuda\\3d\\cone_fp.h",
-"cuda\\3d\\darthelper3d.h",
-"cuda\\3d\\dims3d.h",
-"cuda\\3d\\fdk.h",
-"cuda\\3d\\mem3d.h",
-"cuda\\3d\\par3d_bp.h",
-"cuda\\3d\\par3d_fp.h",
-"cuda\\3d\\sirt3d.h",
-"cuda\\3d\\util3d.h",
+"include\\astra\\cuda\\2d\\algo.h",
+"include\\astra\\cuda\\2d\\arith.h",
+"include\\astra\\cuda\\2d\\astra.h",
+"include\\astra\\cuda\\2d\\cgls.h",
+"include\\astra\\cuda\\2d\\darthelper.h",
+"include\\astra\\cuda\\2d\\dims.h",
+"include\\astra\\cuda\\2d\\em.h",
+"include\\astra\\cuda\\2d\\fan_bp.h",
+"include\\astra\\cuda\\2d\\fan_fp.h",
+"include\\astra\\cuda\\2d\\fbp_filters.h",
+"include\\astra\\cuda\\2d\\fbp.h",
+"include\\astra\\cuda\\2d\\fft.h",
+"include\\astra\\cuda\\2d\\par_bp.h",
+"include\\astra\\cuda\\2d\\par_fp.h",
+"include\\astra\\cuda\\2d\\sart.h",
+"include\\astra\\cuda\\2d\\sirt.h",
+"include\\astra\\cuda\\2d\\util.h",
+"include\\astra\\cuda\\3d\\algo3d.h",
+"include\\astra\\cuda\\3d\\arith3d.h",
+"include\\astra\\cuda\\3d\\astra3d.h",
+"include\\astra\\cuda\\3d\\cgls3d.h",
+"include\\astra\\cuda\\3d\\cone_bp.h",
+"include\\astra\\cuda\\3d\\cone_fp.h",
+"include\\astra\\cuda\\3d\\darthelper3d.h",
+"include\\astra\\cuda\\3d\\dims3d.h",
+"include\\astra\\cuda\\3d\\fdk.h",
+"include\\astra\\cuda\\3d\\mem3d.h",
+"include\\astra\\cuda\\3d\\par3d_bp.h",
+"include\\astra\\cuda\\3d\\par3d_fp.h",
+"include\\astra\\cuda\\3d\\sirt3d.h",
+"include\\astra\\cuda\\3d\\util3d.h",
 ]
 P_astra["filters"]["Algorithms\\headers"] = [
 "a76ffd6d-3895-4365-b27e-fc9a72f2ed75",