Merge remote-tracking branch 'origin/jelic/windows-merge-attempt-1' into jelic/windows-merge-attempt-1

Author: Goran Jelic-Cizmek

.github/workflows/windows.yml

@@ -105,12 +105,17 @@ jobs:
           -DNRN_ENABLE_PYTHON=OFF `
           -DNRN_ENABLE_PYTHON_DYNAMIC=OFF `
           -DNRN_ENABLE_RX3D=OFF `
+          -DNRN_ENABLE_TESTS=ON `
           -DNRN_PYTHON_DYNAMIC="${env:allPythons}" `
           -DNRN_RX3D_OPT_LEVEL=2 `
           -DCYTHON_EXECUTABLE="${env:firstCython}" `
           -DPYTHON_EXECUTABLE="${env:firstPython}"
-        cmake --build build --config Release
+        cmake --build build --config Release -v
       shell: pwsh
       working-directory: ${{runner.workspace}}\nrn
-      env:
-        BUILD_SOURCESDIRECTORY: ${{runner.workspace}}\nrn
+
+    - name: Test Installer
+      run: |
+        ctest --output-on-failure -j
+      shell: pwsh
+      working-directory: ${{runner.workspace}}\nrn\build

src/coreneuron/utils/randoms/nrnran123.cpp

@@ -93,7 +93,7 @@ g_k_qualifiers philox4x32_key_t g_k{{0, 0}};
 // Cannot refer to g_k directly from a nrn_pragma_acc(routine seq) method like
 // coreneuron_random123_philox4x32_helper, and cannot have this inlined there at
 // higher optimisation levels
-__attribute__((noinline)) philox4x32_key_t& global_state() {
+[[gnu::noinline, clang::noinline, msvc::noinline]] philox4x32_key_t& global_state() {
     return random123_global::g_k;
 }
 }  // namespace random123_global

src/ivoc/ivocvect.h

@@ -7,6 +7,11 @@
 #include <numeric>
 #include <algorithm>
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 using ParentVect = std::vector<double>;
 struct Object;
 

src/ivoc/pwman.cpp

@@ -3333,6 +3333,10 @@ Window* PWMImpl::snap_owned(Printer* pr, Window* wp) {
 
 #endif  // HAVE_IV
 
+#if defined(WIN32)
+#include <io.h>
+#endif
+
 char* ivoc_get_temp_file() {
     char* tmpfile;
     const char* tdir = getenv("TEMP");
@@ -3348,9 +3352,13 @@ char* ivoc_get_temp_file() {
         hoc_execerror("Could not create temporary file:", tmpfile);
     }
     close(fd);
+#else
+#if defined(WIN32)
+    _mktemp(tmpfile);
 #else
     mktemp(tmpfile);
 #endif
+#endif
 #if defined(WIN32)
     tmpfile = hoc_back2forward(tmpfile);
 #endif

src/node_order_optim/node_order_optim.h

@@ -9,7 +9,7 @@ extern int interleave_permute_type;
 ///    0  cell together (Section construction order)
 ///    1  Interleave, identical cells warp adjacent
 ///    2  Depth order, optimize adjacent nodes to have adjacent parents.
-void nrn_optimize_node_order(int type);
+int nrn_optimize_node_order(int type);
 
 /// @brief Compute and carry out the permutation for interleave_permute_type
 void nrn_permute_node_order();

src/oc/hoc.cpp

@@ -749,7 +749,7 @@ void fpecatch(int /* sig */) /* catch floating point exceptions */
     hoc_execerror("Floating point exception.", (char*) 0);
 }
 
-__attribute__((noreturn)) void sigsegvcatch(int /* sig */) /* segmentation violation probably due to
+[[noreturn]] void sigsegvcatch(int /* sig */) /* segmentation violation probably due to
                                                               arg type error */
 {
     Fprintf(stderr, "Segmentation violation\n");
@@ -762,7 +762,7 @@ __attribute__((noreturn)) void sigsegvcatch(int /* sig */) /* segmentation viola
 }
 
 #if HAVE_SIGBUS
-__attribute__((noreturn)) void sigbuscatch(int /* sig */) {
+[[noreturn]] void sigbuscatch(int /* sig */) {
     Fprintf(stderr, "Bus error\n");
     print_bt();
     /*ARGSUSED*/
@@ -1702,12 +1702,12 @@ int hoc_get_line(void) { /* supports re-entry. fill hoc_cbuf with next line */
 	ReadConsoleA(GetStdHandle(STD_INPUT_HANDLE), line.data(), line.size(), &n, NULL);
             if (n >= hoc_cbufstr->size - 3) {
                 hocstr_resize(hoc_cbufstr, n + 100);
-                ctp = cbuf = hoc_cbufstr->buf;
+                hoc_ctp = hoc_cbuf = hoc_cbufstr->buf;
             }
-            strcpy(cbuf, line.data());
-            cbuf[n] = '\n';
-            cbuf[n + 1] = '\0';
-            hoc_audit_command(cbuf);
+            strcpy(hoc_cbuf, line.data());
+            hoc_cbuf[n] = '\n';
+            hoc_cbuf[n + 1] = '\0';
+            hoc_audit_command(hoc_cbuf);
 #else
 #if INTERVIEWS
         if (nrn_fw_eq(hoc_fin, stdin) && hoc_interviews && !hoc_in_yyparse) {

src/scopmath/sparse_thread.hpp

@@ -73,7 +73,7 @@ create_coef_list makes a list for fast setup, does minimum ordering and
 ensures all elements needed are present */
 /* this could easily be made recursive but it isn't right now */
 
-inline __attribute__((always_inline)) void subrow(SparseObj* so, Elm* pivot, Elm* rowsub) {
+[[gnu::always_inline, clang::always_inline]] inline void subrow(SparseObj* so, Elm* pivot, Elm* rowsub) {
     double r;
     Elm* el;
 
@@ -89,7 +89,7 @@ inline __attribute__((always_inline)) void subrow(SparseObj* so, Elm* pivot, Elm
     }
 }
 
-inline __attribute__((always_inline)) void bksub(SparseObj* so) {
+[[gnu::always_inline, clang::always_inline]] inline void bksub(SparseObj* so) {
     unsigned i;
     Elm* el;
 
@@ -103,7 +103,7 @@ inline __attribute__((always_inline)) void bksub(SparseObj* so) {
     }
 }
 
-inline __attribute__((always_inline)) int matsol(SparseObj* so) {
+[[gnu::always_inline, clang::always_inline]] inline int matsol(SparseObj* so) {
     Elm *pivot, *el;
     unsigned i;
 
@@ -238,7 +238,7 @@ saves much time allocating and freeing during the solve phase
 */
 
 /* return pointer to row col element maintaining order in rows */
-inline __attribute__((always_inline)) Elm* getelm(SparseObj* so,
+[[gnu::always_inline, clang::always_inline]] inline Elm* getelm(SparseObj* so,
                                                   unsigned row,
                                                   unsigned col,
                                                   Elm* newElm) {
@@ -519,7 +519,7 @@ inline void reduce_order(SparseObj* so, unsigned row) {
     insert(so, order);
 }
 
-inline __attribute__((always_inline)) void get_next_pivot(SparseObj* so, unsigned i) {
+[[gnu::always_inline, clang::always_inline]] inline void get_next_pivot(SparseObj* so, unsigned i) {
     /* get varord[i], etc. from the head of the orderlist. */
     Item* order;
     Elm *pivot, *el;
@@ -589,7 +589,7 @@ void create_coef_list(SparseObj* so, int n, Callable fun, Args&&... args) {
     so->phase = 0;
 }
 
-inline __attribute__((always_inline)) void init_coef_list(SparseObj* so) {
+[[gnu::always_inline, clang::always_inline]] inline void init_coef_list(SparseObj* so) {
     unsigned i;
     Elm* el;
 
@@ -733,7 +733,7 @@ int _cvode_sparse_thread(void** v, int n, IndexArray x, Array p, Callable fun, A
     return SUCCESS;
 }
 
-inline __attribute__((always_inline)) double* _nrn_thread_getelm(SparseObj* so, int row, int col) {
+[[gnu::always_inline, clang::always_inline]] inline double* _nrn_thread_getelm(SparseObj* so, int row, int col) {
     detail::sparse_thread::Elm* el;
     if (!so->phase) {
         return so->coef_list[so->ngetcall++];