Skip to content
Snippets Groups Projects
Commit 408eea80 authored by Raimon Tolosana-Delgado's avatar Raimon Tolosana-Delgado
Browse files

reattempt to make openMP work multiplatform

parent 1052fde8
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ Description: Support for geostatistical analysis of multivariate data, ...@@ -50,7 +50,7 @@ Description: Support for geostatistical analysis of multivariate data,
The methods mainly follow Tolosana-Delgado, Mueller and van den The methods mainly follow Tolosana-Delgado, Mueller and van den
Boogaart (2018) <doi:10.1007/s11004-018-9769-3>. Boogaart (2018) <doi:10.1007/s11004-018-9769-3>.
License: CC BY-SA 4.0 | GPL (>=2) License: CC BY-SA 4.0 | GPL (>=2)
URL: https://gitlab.hzdr.de/tolosa53/gmgeostats URL: https://gitlab.hzdr.de/geomet/gmGeostats
Copyright: (C) 2020 by Helmholtz-Zentrum Dresden-Rossendorf and Edith Cowan University; Copyright: (C) 2020 by Helmholtz-Zentrum Dresden-Rossendorf and Edith Cowan University;
gsi.DS code by Hassan Talebi gsi.DS code by Hassan Talebi
RoxygenNote: 7.1.0 RoxygenNote: 7.1.0
......
## Test environments ## Test environments
* Linux: Ubuntu 18.04.4LTS (local) * Linux: Ubuntu 18.04.4LTS (local)
- R 3.4.4 (production) - R 3.4.4 (production)
- R devel 2020-07-28 r78930 (test) - R devel 2020-07-28 r78930 (test)
- R patched 4.0.2 r78930 (test) - R patched 4.0.2 r78930 (test)
* Windows 7 Enterprise (test) * Windows 7 Enterprise (test)
- R 3.5.1 (test) - R 3.5.1 (test)
* MacOS x86_64-apple-darwin15.6.0 (64-bit) (test)
- R 3.6.1 (2019-07-05)
## R CMD check results
## R CMD check results
0 errors | 0 warnings | 0 notes
0 errors | 0 warnings | 0 notes
## This is a resubmission
## This is a resubmission
```
``` Dear maintainer,
Dear maintainer,
Please see the problems shown on
Please see the problems shown on <https://cran.r-project.org/web/checks/check_results_gmGeostats.html>.
<https://cran.r-project.org/web/checks/check_results_gmGeostats.html>.
Please correct before 2020-10-03 to safely retain your package on CRAN.
Please correct before 2020-10-03 to safely retain your package on CRAN.
The CRAN Team
The CRAN Team ```
```
... the sympthom being an error while #include <omp.h> in r-release-macos-x86_64, we identified the problem as a lack of appropriate linkage of OpenMP.
... the sympthom being an error while #include <omp.h> in r-release-macos-x86_64, we identified the problem as a lack of appropriate linkage of OpenMP.
Solution:
Solution: 1.- the header inclusion and all usages of #pragma directives were enclosed in conditional structures
1.- the header inclusion and all usages of #pragma directives were enclosed in conditional structures #ifdef _OPENMP
#ifdef _OPENMP ...
... #endif
#endif
2. `$(SHLIB_OPENMP_CFLAGS)` was added to PKG_CFLAGS and PKG_LIBS fields in Makevars files
2. `$(SHLIB_OPENMP_CFLAGS)` was added to PKG_CFLAGS and PKG_LIBS fields in Makevars files
NOTE: we do not have access to any MacOS machine to test that our solution is effective. Our apologies if this is not working!
3.- as mentioned in `Test environments`, the new code was tested under MacOS as well. \ No newline at end of file
This diff is collapsed.
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