From 5a010d39704cb49ad789cc7b39ae845d29ff6521 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 22 Feb 2019 14:53:04 +0100
Subject: [PATCH] remove SHARP_NO_OPENMP flag
---
libsharp/sharp.c | 6 +++---
libsharp/sharp.h | 1 -
libsharp/sharp_mpi.c | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libsharp/sharp.c b/libsharp/sharp.c
index 59e4638..f811ab4 100644
--- a/libsharp/sharp.c
+++ b/libsharp/sharp.c
@@ -761,7 +761,7 @@ NOINLINE static void map2phase (sharp_job *job, int mmax, int llim, int ulim)
}
else
{
-#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0)
+#pragma omp parallel
{
ringhelper helper;
ringhelper_init(&helper);
@@ -806,7 +806,7 @@ NOINLINE static void phase2map (sharp_job *job, int mmax, int llim, int ulim)
}
else
{
-#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0)
+#pragma omp parallel
{
ringhelper helper;
ringhelper_init(&helper);
@@ -872,7 +872,7 @@ NOINLINE static void sharp_execute_job (sharp_job *job)
/* map->phase where necessary */
map2phase (job, mmax, llim, ulim);
-#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0)
+#pragma omp parallel
{
sharp_job ljob = *job;
ljob.opcnt=0;
diff --git a/libsharp/sharp.h b/libsharp/sharp.h
index 1171372..657e369 100644
--- a/libsharp/sharp.h
+++ b/libsharp/sharp.h
@@ -195,7 +195,6 @@ typedef enum { SHARP_DP = 1<<4,
SHARP_NO_FFT = 1<<7,
SHARP_USE_WEIGHTS = 1<<20, /* internal use only */
- SHARP_NO_OPENMP = 1<<21, /* internal use only */
} sharp_jobflags;
/*! Performs a libsharp SHT job. The interface deliberately does not use
diff --git a/libsharp/sharp_mpi.c b/libsharp/sharp_mpi.c
index ed3063a..02c76c3 100644
--- a/libsharp/sharp_mpi.c
+++ b/libsharp/sharp_mpi.c
@@ -266,7 +266,7 @@ static void sharp_execute_job_mpi (sharp_job *job, MPI_Comm comm)
map2alm_comm (job, &minfo);
-#pragma omp parallel if ((job->flags&SHARP_NO_OPENMP)==0)
+#pragma omp parallel
{
sharp_job ljob = *job;
sharp_Ylmgen_C generator;
--
GitLab