Aquila-Consortium/libsharp2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove SHARP_NO_OPENMP flag

Browse source
This commit is contained in:
Martin Reinecke 2019-02-22 14:53:04 +01:00
parent 04aa8245d0
commit 5a010d3970
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libsharp/sharp.c
View file

@ -761,7 +761,7 @@ NOINLINE static void map2phase (sharp_job *job, int mmax, int llim, int ulim)
} }
else else
{ {
#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0) #pragma omp parallel
{ {
ringhelper helper; ringhelper helper;
ringhelper_init(&helper); ringhelper_init(&helper);
@ -806,7 +806,7 @@ NOINLINE static void phase2map (sharp_job *job, int mmax, int llim, int ulim)
} }
else else
{ {
#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0) #pragma omp parallel
{ {
ringhelper helper; ringhelper helper;
ringhelper_init(&helper); ringhelper_init(&helper);
@ -872,7 +872,7 @@ NOINLINE static void sharp_execute_job (sharp_job *job)
/* map->phase where necessary */ /* map->phase where necessary */
map2phase (job, mmax, llim, ulim); map2phase (job, mmax, llim, ulim);
#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0) #pragma omp parallel
{ {
sharp_job ljob = *job; sharp_job ljob = *job;
ljob.opcnt=0; ljob.opcnt=0;

1
libsharp/sharp.h
View file

@ -195,7 +195,6 @@ typedef enum { SHARP_DP = 1<<4,
SHARP_NO_FFT = 1<<7, SHARP_NO_FFT = 1<<7,
SHARP_USE_WEIGHTS = 1<<20, /* internal use only */ SHARP_USE_WEIGHTS = 1<<20, /* internal use only */
SHARP_NO_OPENMP = 1<<21, /* internal use only */
} sharp_jobflags; } sharp_jobflags;
/*! Performs a libsharp SHT job. The interface deliberately does not use /*! Performs a libsharp SHT job. The interface deliberately does not use

2
libsharp/sharp_mpi.c
View file

@ -266,7 +266,7 @@ static void sharp_execute_job_mpi (sharp_job *job, MPI_Comm comm)
map2alm_comm (job, &minfo); map2alm_comm (job, &minfo);
#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0) #pragma omp parallel
{ {
sharp_job ljob = *job; sharp_job ljob = *job;
sharp_Ylmgen_C generator; sharp_Ylmgen_C generator;