Skip to content
Snippets Groups Projects
Commit d57c1ff8 authored by Moises Fernandez's avatar Moises Fernandez
Browse files

Change order of instructions because CUDA compiler fails (compiler problem)

parent f50a4408
No related branches found
No related tags found
No related merge requests found
...@@ -297,7 +297,6 @@ __device__ void grad_PVM_single_c( //INPUT ...@@ -297,7 +297,6 @@ __device__ void grad_PVM_single_c( //INPUT
for(int dir=0;dir<max_dir;dir++){ for(int dir=0;dir<max_dir;dir++){
for (int p=0; p<nparams; p++) myJ[p]=0; for (int p=0; p<nparams; p++) myJ[p]=0;
if(dir<ndir){ if(dir<ndir){
Iso_term=isoterm_PVM_single_c(dir_iter,_d,bvals); //Precompute some terms for this datapoint
for(int k=0;k<nfib;k++){ for(int k=0;k<nfib;k++){
int kk = 2+3*(k) +1; int kk = 2+3*(k) +1;
xx.x=x[k*3]; xx.x=x[k*3];
...@@ -306,6 +305,7 @@ __device__ void grad_PVM_single_c( //INPUT ...@@ -306,6 +305,7 @@ __device__ void grad_PVM_single_c( //INPUT
//Aniso_terms[k]=anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections); //Aniso_terms[k]=anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections);
myJ[kk] = anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections); myJ[kk] = anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections);
} }
Iso_term=isoterm_PVM_single_c(dir_iter,_d,bvals); //Precompute some terms for this datapoint
sig = 0; sig = 0;
for(int k=0;k<nfib;k++){ for(int k=0;k<nfib;k++){
int kk = 2+3*(k); int kk = 2+3*(k);
...@@ -438,8 +438,7 @@ __device__ void hess_PVM_single_c( //INPUT ...@@ -438,8 +438,7 @@ __device__ void hess_PVM_single_c( //INPUT
for(int dir=0;dir<max_dir;dir++){ for(int dir=0;dir<max_dir;dir++){
for (int p=0; p<nparams; p++) myJ[p]=0; for (int p=0; p<nparams; p++) myJ[p]=0;
if(dir<ndir){ if(dir<ndir){
Iso_term=isoterm_PVM_single_c(dir_iter,_d,bvals); //Precompute some terms for this datapoint
for(int k=0;k<nfib;k++){ for(int k=0;k<nfib;k++){
int kk = 2+3*(k) +1; int kk = 2+3*(k) +1;
xx.x=x[k*3]; xx.x=x[k*3];
...@@ -448,6 +447,7 @@ __device__ void hess_PVM_single_c( //INPUT ...@@ -448,6 +447,7 @@ __device__ void hess_PVM_single_c( //INPUT
//Aniso_terms[k]=anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections); //Aniso_terms[k]=anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections);
myJ[kk] = anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections); myJ[kk] = anisoterm_PVM_single_c(dir_iter,_d,xx,bvecs,bvals,ndirections);
} }
Iso_term=isoterm_PVM_single_c(dir_iter,_d,bvals); //Precompute some terms for this datapoint
sig = 0; sig = 0;
for(int k=0;k<nfib;k++){ for(int k=0;k<nfib;k++){
int kk = 2+3*(k); int kk = 2+3*(k);
...@@ -526,7 +526,7 @@ extern "C" __global__ void fit_PVM_single_c_kernel( //INPUT ...@@ -526,7 +526,7 @@ extern "C" __global__ void fit_PVM_single_c_kernel( //INPUT
const bool m_return_fanning, const bool m_return_fanning,
const bool gradnonlin, const bool gradnonlin,
//INPUT - OUTPUT //INPUT - OUTPUT
float* params) float* params)
{ {
int idSubVOX = threadIdx.x; int idSubVOX = threadIdx.x;
int idVOX = blockIdx.x; int idVOX = blockIdx.x;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment