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

pragmas well done

parent 10146b8a
No related branches found
No related tags found
No related merge requests found
# gmGeostats 0.10.6.9000 # gmGeostats 0.10.6.9000
* (2020-09-24) openMP pragmas enclosed, to improve portability
* (2020-09-18) conversion of variogram models of class CompLinModCoReg -> LMCAnisCompo -> variogramModel(List) * (2020-09-18) conversion of variogram models of class CompLinModCoReg -> LMCAnisCompo -> variogramModel(List)
* (2020-09-18) `gsi.gstatCokriging2compo()` and `gsi.gstatCokriging2rmult()` now work with systems of 3 components resp. 2 variables (systems of 2 components or 1 variable still fail) * (2020-09-18) `gsi.gstatCokriging2compo()` and `gsi.gstatCokriging2rmult()` now work with systems of 3 components resp. 2 variables (systems of 2 components or 1 variable still fail)
......
...@@ -6,36 +6,35 @@ ...@@ -6,36 +6,35 @@
- 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 (test)
-
## R CMD check results ## R CMD check results
0 errors | 0 warnings | 1 note 0 errors | 0 warnings | 0 notes
* NOTE: This is a new release.
## Resubmission ## This is a resubmission
* this is a resubmission, after the following manual check report:
``` ```
Dear maintainer, Dear maintainer,
package gmGeostats_0.10-6.tar.gz does not pass the incoming checks automatically, please see the following pre-tests: Please see the problems shown on
Windows: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.10-6_20200907_204330/Windows/00check.log> <https://cran.r-project.org/web/checks/check_results_gmGeostats.html>.
Status: 2 ERRORs, 1 NOTE
Debian: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.10-6_20200907_204330/Debian/00check.log>
Status: 1 NOTE
(...) Please correct before 2020-10-03 to safely retain your package on CRAN.
Best regards, The CRAN Team
CRAN teams' auto-check service
``` ```
Actions: ... 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.
All errors are bound to calls to getTellus(), a function to download and preprocess an illustration data set. Solution:
1.- the header inclusion and all usages of #pragma directives were enclosed in conditional structures
#ifdef _OPENMP
...
#endif
--> all calls to getTellus() are now encased in \dontrun{}. These were originally in \donttest{} environments, which were "fred" after request from CRAN maintaner (taking less than 5ms). We did not realise that downloading files might be problematic. Apologies. 2. `$(SHLIB_OPENMP_CFLAGS)` was added to PKG_CFLAGS and PKG_LIBS fields in Makevars files
--> package was re-tested under all environments mentioned above, producing only one "NOTE: this is a new submission".
3.- as mentioned in `Test environments`, the new code was tested under MacOS as well.
#PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -lstdc++ # $(SHLIB_OPENMP_CFLAGS) PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -lstdc++ $(SHLIB_OPENMP_CFLAGS)
C_OBJS = gmGeostats.o C_OBJS = gmGeostats.o
OBJECTS = $(C_OBJS) OBJECTS = $(C_OBJS)
all: $(SHLIB) all: $(SHLIB)
$(SHLIB): $(OBJECTS) $(SHLIB): $(OBJECTS)
clean: clean:
@rm -rf *.mod *.d *.rc *.dylib *.a *.lib $(SHLIB) $(OBJECTS) @rm -rf *.mod *.d *.rc *.dylib *.a *.lib $(SHLIB) $(OBJECTS)
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