shorten paths in inst/include/nCompiler due to warnings that long paths are not portable (#93)

Author: perrydv

archived_tests/v1tests/status.txt

@@ -68,7 +68,7 @@ labelAbstractTypes: [ FAIL 0 | WARN 0 | SKIP 1 | PASS 25 ]
 
 math:
 
-nClass_interface: [ FAIL 2 | WARN 0 | SKIP 0 | PASS 4 ]
+nC_inter: [ FAIL 2 | WARN 0 | SKIP 0 | PASS 4 ]
 `check` not equal to array(c(2.3, 3.4, 4.5)).
 Attributes: < target is NULL, current is list >
 vector set and get from a full interface

nCompiler/NAMESPACE

@@ -9,7 +9,7 @@ export(argType2Cpp)
 export(build_compiled_nClass)
 export(calcInputList_to_calcInstrList)
 export(calcInstr_nClass)
-export(calcInstrList_nClass)
+export(calcInstrList_nC)
 export(cloglog)
 export(check_Rcpp_for_nCompiler)
 export(compileNimble)

nCompiler/R/Rcpp_nCompiler_plugin.R

@@ -12,13 +12,13 @@ inlineCxxPlugin_env <- new.env()
 ##  registerPlugin occurs in the package source code.
 inlineCxxPlugin <- function(...) {
   uses_eigen <- !isFALSE(inlineCxxPlugin_env$uses_eigen)
-  uses_nClass_interface <- !isFALSE(inlineCxxPlugin_env$uses_nClass_interface)
+  uses_nC_inter <- !isFALSE(inlineCxxPlugin_env$uses_nC_inter)
   uses_nList <- !isFALSE(inlineCxxPlugin_env$uses_nList)
   uses_cereal <- !isFALSE(inlineCxxPlugin_env$uses_cereal)
   uses_TBB <- FALSE # !isFALSE(inlineCxxPlugin_env$uses_TBB) # including here causes error due to #defining FALSE
   include.before <- character()
   if(uses_eigen) include.before <- paste0(include.before, "#define NCOMPILER_USES_EIGEN\n")
-  if(uses_nClass_interface) include.before <- paste0(include.before, "#define NCOMPILER_USES_NCLASS_INTERFACE\n")
+  if(uses_nC_inter) include.before <- paste0(include.before, "#define NCOMPILER_USES_NCLASS_INTERFACE\n")
   if(uses_nList) include.before <- paste0(include.before, "#define NCOMPILER_USES_NLIST\n")
   if(uses_cereal) include.before <- paste0(include.before, "#define NCOMPILER_USES_CEREAL\n")
   if(uses_TBB) include.before <- paste0(include.before, "#define NCOMPILER_USES_TBB\n")

nCompiler/R/cppDefs_R_interface_calls.R

@@ -5,7 +5,7 @@ global_R_interface_cppDef <-
     #                                    ),
     #                      Hincludes = nCompilerIncludeFile("nCompiler_omnibus_first_h.h"),
     #CPPincludes = c(nCompilerIncludeFile("nCompiler_omnibus_first_cpp.h"),
-    #  nCompilerIncludeFile("nClass_interface/post_Rcpp/process_call_args.h")),
+    #  nCompilerIncludeFile("nC_inter/post_Rcpp/process_call_args.h")),
     Hpreamble = c("#define NCOMPILER_USES_NCLASS_INTERFACE",
                   "#define USES_NCOMPILER"),
     CPPpreamble = c("#define NCOMPILER_USES_NCLASS_INTERFACE",

nCompiler/R/cppDefs_serialize.R

@@ -19,7 +19,7 @@ global_serialization_cppDef <-
     # This is done here because it must be done once and only once to avoid
     # duplicate symbols when compiling as a package.
     CPPincludes = c(#nCompilerIncludeFile("nCompiler_omnibus_first_cpp.h"),
-                    nCompilerIncludeFile("nClass_cereal/post_Rcpp/serialization_mgr.h")),
+                    nCompilerIncludeFile("nC_cereal/post_Rcpp/serialization_mgr.h")),
     CPPusings = c("using namespace Rcpp;",
                   "// [[Rcpp::plugins(nCompiler_plugin)]]",
                   "// [[Rcpp::depends(nCompiler)]]",

nCompiler/R/nimbleModels.R

@@ -20,7 +20,7 @@ nodeInstr_nClass <- nClass(
     methodInstr = 'integerVector',
     indsInstrVec = "nList('integerVector')"
   ),
-  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
+  predefined = quote(system.file(file.path("include","nCompiler", "predef"), package="nCompiler") |>
                file.path("nodeInstr_nClass")),
   compileInfo=list(interface="full",
                    createFromR = TRUE#,
@@ -34,7 +34,7 @@ calcInstr_nClass <- nClass(
     nodeIndex = 'integerScalar',
     nodeInstrVec = "nList('nodeInstr_nClass')"
   ),
-  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
+  predefined = quote(system.file(file.path("include","nCompiler", "predef"), package="nCompiler") |>
                file.path("calcInstr_nClass")),
   compileInfo=list(interface="full",
                    createFromR = TRUE,
@@ -43,13 +43,13 @@ calcInstr_nClass <- nClass(
                    )
 )
 
-calcInstrList_nClass <- nClass(
-  classname = "calcInstrList_nClass",
+calcInstrList_nC <- nClass(
+  classname = "calcInstrList_nC",
   Cpublic = list(
     calcInstrList = "nList('calcInstr_nClass')"
   ),
-  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
-               file.path("calcInstrList_nClass")),
+  predefined = quote(system.file(file.path("include","nCompiler", "predef"), package="nCompiler") |>
+               file.path("calcInstrList_nC")),
   compileInfo=list(interface="full",
                    createFromR = TRUE,
                    Hincludes = "<calcInstr_nClass_c_.h>")
@@ -71,7 +71,7 @@ nodeFxnBase_nClass <- nClass(
   ),
   # We haven't dealt with ensuring a virtual destructor when any method is virtual
   # For now I did it manually by editing the .h and .cpp
-  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
+  predefined = quote(system.file(file.path("include","nCompiler", "predef"), package="nCompiler") |>
                file.path("nodeFxnBase_nClass")),
   compileInfo=list(interface="full",
                    createFromR = FALSE)
@@ -92,17 +92,17 @@ modelBase_nClass <- nClass(
         function(calcInstrList) {cat("In uncompiled calculate\n")},
         returnType = 'numericScalar',
         compileInfo = list(
-          C_fun = function(calcInstrList='calcInstrList_nClass') {
+          C_fun = function(calcInstrList='calcInstrList_nC') {
             cppLiteral('Rprintf("modelBase_nClass calculate (should not see this)\\n");'); return(0)},
           virtual=TRUE
         )
     )  
   ),
   # See comment above about needing to ensure a virtual destructor
-  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |> file.path("modelBase_nClass")),
+  predefined = quote(system.file(file.path("include","nCompiler", "predef"), package="nCompiler") |> file.path("modelBase_nClass")),
   compileInfo=list(interface="full",
                    createFromR = FALSE,
-                   Hincludes = c("<nodeFxnBase_nClass_c_.h>", "<calcInstrList_nClass_c_.h>"))
+                   Hincludes = c("<nodeFxnBase_nClass_c_.h>", "<calcInstrList_nC_c_.h>"))
 )
 
 # nCompile(modelBase_nClass, control=list(generate_predefined=TRUE))
@@ -267,7 +267,7 @@ makeModel_nClass <- function(varInfo,
       compileInfo = list(opDefs = OPDEFS,
                          nClass_inherit = list(base=BASECLASS)
                          #inherit = list(base = "public modelClass_<mymodel>"),
-                         #Hincludes = "<nCompiler/nClass_interface/post_Rcpp/nCompiler_model_base_devel.h>"
+                         #Hincludes = "<nCompiler/nC_inter/post_Rcpp/nCompiler_model_base_devel.h>"
                          ),
       Cpublic = CPUBLIC
     ),
@@ -358,7 +358,7 @@ make_model_from_nimbleModel <- function(m) {
   model <- makeModel_nClass(modelVarInfo, nodeInfoList, classname = "my_model")
   # Currently we must compile from here because here is where we know the nodeFxnName[s].
   # We have a situation where order matters: model needs to come after the utility classes. Fix me.
-  argList <- list("modelBase_nClass", "nodeFxnBase_nClass", "calcInstrList_nClass", "calcInstr_nClass", "nodeInstr_nClass", "model")
+  argList <- list("modelBase_nClass", "nodeFxnBase_nClass", "calcInstrList_nC", "calcInstr_nClass", "nodeInstr_nClass", "model")
   argList <- c(argList, as.list(nodeFxnNames))
   argList <- argList |> lapply(as.name)
   Cmodel <- do.call("nCompile", argList)
@@ -386,7 +386,7 @@ calcInputList_to_calcInstrList <- function(calcInputList, comp) {
   calcInstr$nodeInstrVec <- nodeInstrVec
   calcInstrList[[iCalc]] <- calcInstr
   }
-  calcInstrListObj <- comp$calcInstrList_nClass$new()
+  calcInstrListObj <- comp$calcInstrList_nC$new()
   calcInstrListObj$calcInstrList <- calcInstrList
   return(calcInstrListObj)
 }

…er/EigenTensor_Rcpp_extensions/.DS_Store …/include/nCompiler/ET_Rcpp_ext/.DS_StorenCompiler/inst/include/nCompiler/EigenTensor_Rcpp_extensions/.DS_Store renamed to nCompiler/inst/include/nCompiler/ET_Rcpp_ext/.DS_Store nCompiler/inst/include/nCompiler/EigenTensor_Rcpp_extensions/.DS_Store renamed to nCompiler/inst/include/nCompiler/ET_Rcpp_ext/.DS_Store

@@ -1,5 +1,5 @@
-#ifndef EIGENTENSOR_RCPP_EXTENSIONS_FORWARD_DECLARATIONS_H_
-#define EIGENTENSOR_RCPP_EXTENSIONS_FORWARD_DECLARATIONS_H_
+#ifndef ET_Rcpp_ext_FORWARD_DECLARATIONS_H_
+#define ET_Rcpp_ext_FORWARD_DECLARATIONS_H_
 
 #include <type_traits>
 #include <memory>
@@ -59,4 +59,4 @@ namespace Rcpp {
   } // end namespace traits
 } // end namespace Rcpp
 
-#endif // EIGENTENSOR_RCPP_EXTENSIONS_FORWARD_DECLARATIONS_H_
+#endif // ET_Rcpp_ext_FORWARD_DECLARATIONS_H_

…r_Rcpp_extensions_forward_declarations.h …p_ext/ET_Rcpp_ext_forward_declarations.hnCompiler/inst/include/nCompiler/EigenTensor_Rcpp_extensions/EigenTensor_Rcpp_extensions_forward_declarations.h renamed to nCompiler/inst/include/nCompiler/ET_Rcpp_ext/ET_Rcpp_ext_forward_declarations.h nCompiler/inst/include/nCompiler/EigenTensor_Rcpp_extensions/EigenTensor_Rcpp_extensions_forward_declarations.h renamed to nCompiler/inst/include/nCompiler/ET_Rcpp_ext/ET_Rcpp_ext_forward_declarations.h

@@ -0,0 +1,10 @@
+//#ifndef NCOMPILER_ET_Rcpp_ext_H_
+//#define NCOMPILER_ET_Rcpp_ext_H_
+
+//#include "ET_Rcpp_ext_pre_Rcpp.h"
+#include <nCompiler/ET_Rcpp_ext/post_Rcpp/SEXP_2_EigenTensor.h>
+#include <nCompiler/ET_Rcpp_ext/post_Rcpp/ET_Rcpp_as_wrap.h>
+#include <nCompiler/ET_Rcpp_ext/post_Rcpp/ET_SEXP_converter.h>
+#include <nCompiler/ET_Rcpp_ext/post_Rcpp/ETaccessor_post_Rcpp.h>
+
+//#endif // EIGEN_RCPP_EXTENSIONS_H_

nCompiler/inst/include/nCompiler/ET_Rcpp_ext/ET_Rcpp_ext_post_Rcpp.h

@@ -7,8 +7,8 @@
 #define EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS
 
 //#include <RcppCommon.h>
-#include "EigenTensor_Rcpp_extensions_forward_declarations.h"
-//#include <nCompiler/EigenTensor_extensions/EigenTensor_extensions_pre_Rcpp.h>
+#include "ET_Rcpp_ext_forward_declarations.h"
+//#include <nCompiler/ET_ext/ET_ext_pre_Rcpp.h>
 #include "ETaccessor.h"
 
 //#endif // NCOMPILER_TENSOR_RCPP_FORWARD_DECLARATIONS_H_