From 563165e26cbc52fb4b17ea57c6ffb5e3774951af Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sat, 14 Mar 2020 19:01:59 +0100
Subject: [PATCH] Avoid GNU extension __restrict__ (prevents building with
MSVC)
---
generated_files/cone_projector_3D_CudaKernel_hardware_interp.cu | 2 +-
src/pyronn_torch/PYRO-NN-Layers | 2 +-
src/pyronn_torch/codegen.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/generated_files/cone_projector_3D_CudaKernel_hardware_interp.cu b/generated_files/cone_projector_3D_CudaKernel_hardware_interp.cu
index a533371..8c23640 100644
--- a/generated_files/cone_projector_3D_CudaKernel_hardware_interp.cu
+++ b/generated_files/cone_projector_3D_CudaKernel_hardware_interp.cu
@@ -202,7 +202,7 @@ __global__ void project_3Dcone_beam_kernel_tex_interp(
*
*/
void Cone_Projection_Kernel_Tex_Interp_Launcher(
- const float *__restrict__ volume_ptr, float *out,
+ const float * volume_ptr, float *out,
const float *inv_AR_matrix, const float *src_points,
const int number_of_projections, const int volume_width,
const int volume_height, const int volume_depth,
diff --git a/src/pyronn_torch/PYRO-NN-Layers b/src/pyronn_torch/PYRO-NN-Layers
index 2cf5bdb..c776c3d 160000
--- a/src/pyronn_torch/PYRO-NN-Layers
+++ b/src/pyronn_torch/PYRO-NN-Layers
@@ -1 +1 @@
-Subproject commit 2cf5bdbf36e606eedf51ffb2ae84a7e3a4bb4492
+Subproject commit c776c3d7315f483937a7cebf667c6d491ecd57e6
diff --git a/src/pyronn_torch/codegen.py b/src/pyronn_torch/codegen.py
index 602937a..6ac63f6 100644
--- a/src/pyronn_torch/codegen.py
+++ b/src/pyronn_torch/codegen.py
@@ -99,7 +99,7 @@ try:
fields_accessed=[volume, projection, inv_matrices, source_points],
custom_signature="""
void Cone_Projection_Kernel_Tex_Interp_Launcher(
- const float *__restrict__ volume_ptr, float *out,
+ const float *volume_ptr, float *out,
const float *inv_AR_matrix, const float *src_points,
const int number_of_projections, const int volume_width,
const int volume_height, const int volume_depth,
--
GitLab