try mkn

PhilipDeegan · Dec 14, 2022 · 08ebff8 · 08ebff8
1 parent afa7d97
commit 08ebff8
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 241 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -8,6 +8,7 @@ on:
     branches: [ master ]
 
 env:
+  KLOG: 3
   TICK_DEBUG: 0
 
 
@@ -27,19 +28,10 @@ jobs:
       with:
         submodules: true
 
-    - name: install swig
-      run: |
-        git clone https://github.com/swig/swig -b rel-4.0.2 swig
-        (cd swig && ./autogen.sh && ./configure --without-pcre && make && sudo make install )
-        rm -rf swig
-
-    # - name: install gtest
-    #   run: |
-    #     git clone https://github.com/google/googletest --depth 1 gtest
-    #     (cd gtest && mkdir -p build && cd build && cmake .. && make && sudo make install)
-    #     rm -rf gtest
+    - run: |
+        swig -version
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml
@@ -8,6 +8,7 @@ on:
     branches: [ master ]
 
 env:
+  KLOG: 3
   TICK_DEBUG: 0
   TICK_WERROR: 0
 
@@ -26,21 +27,10 @@ jobs:
       with:
         submodules: true
 
-    - name: install swig
-      run: |
-        brew update
-        brew install automake m4
-        git clone https://github.com/swig/swig -b rel-4.0.2 swig
-        (cd swig && ./autogen.sh && ./configure --without-pcre && make && make install)
-        rm -rf swig
-
-    # - name: install gtest
-    #   run: |
-    #     git clone https://github.com/google/googletest --depth 1 gtest
-    #     (cd gtest && mkdir -p build && cd build && cmake .. && make && make install)
-    #     rm -rf gtest
-
-    - uses: actions/setup-python@v1
+    - run: |
+        swig -version
+
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -27,7 +27,7 @@ jobs:
       with:
         submodules: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml
@@ -21,7 +21,7 @@ jobs:
       with:
         submodules: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml
@@ -21,7 +21,7 @@ jobs:
       with:
         submodules: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.travis.yml.off b/.travis.yml.off
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/lib/include/tick/base/parallel/parallel_utils.h b/lib/include/tick/base/parallel/parallel_utils.h
@@ -17,7 +17,7 @@ namespace tick {
  * type 'S' with parameter types 'Args...'
  */
 template <typename T, typename S, typename... Args>
-using FuncResultType = typename std::result_of<T(S, ulong, Args...)>::type;
+using FuncResultType = std::invoke_result_t<T, S, ulong, Args...>;
 
 /**
  * Determine if return type of function call is a Python primitive or not

diff --git a/lib/mkn.yaml b/lib/mkn.yaml
@@ -1,9 +1,8 @@
-#! clean build -dtS
+#! clean build -dtSOg 0
 
 name: tick
 
 self:
-  serialization
   preprocessing
   array_test
   hawkes/simulation
@@ -46,6 +45,9 @@ property:
 profile:
   - name: arg
     arg: ${cargs}
+    inc:
+      ./include
+      ./third_party/cereal/include
     if_arg:
       win: ${win_cargs}
       nix: ${nix_cargs}
@@ -54,6 +56,17 @@ profile:
       nix_lib: ${nix_largs}
       bsd_lib: ${bsd_largs}
       win: -nodefaultlib:libucrt.lib ucrt.lib -MANIFEST:EMBED,ID=2 -MANIFESTUAC:NO -LTCG
+    mod: |
+      lang.python3{compile{with: numpy}}
+
+  - name: array
+    parent: arg
+    src:
+      ./cpp/array
+      ./swig/tick/array
+    install: ${lib_path}/array/build
+    mod: |
+      lang.swig{compile{src: swig/tick/array/array_module.i, inc: include swig}}
 
   - name: base
     parent: arg
@@ -62,18 +75,8 @@ profile:
       ./cpp/base
       ./swig/tick/base
     install: ${lib_path}/base/build
-    out: _base${lib_name}
-
-  - name: array
-    parent: arg
-    inc:
-      ./include
-      ./third_party/cereal/include
-    src:
-      ./cpp/array
-      ./swig/tick/array
-    install: ${lib_path}/array/build
-    out: _array${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/base/base_module.i, inc: include swig}}
 
   - name: array_test
     parent: arg
@@ -82,7 +85,8 @@ profile:
       ./cpp/array_test
       ./swig/tick/array_test
     install: ${lib_path}/array_test/build
-    out: _array_test${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/array_test/array_test_module.i, inc: include swig}}
 
   - name: base_model
     parent: arg
@@ -91,7 +95,8 @@ profile:
       ./cpp/base_model
       ./swig/tick/base_model
     install: ${lib_path}/base_model/build
-    out: _base_model${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/base_model/base_model_module.i, inc: include swig}}
 
   - name: hawkes/model
     parent: arg
@@ -100,7 +105,8 @@ profile:
       ./cpp/hawkes/model
       ./swig/tick/hawkes/model
     install: ${lib_path}/hawkes/model/build
-    out: _hawkes_model${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/hawkes/model/hawkes_model_module.i, inc: include swig}}
 
   - name: hawkes/simulation
     parent: arg
@@ -109,7 +115,8 @@ profile:
       ./cpp/hawkes/simulation
       ./swig/tick/hawkes/simulation
     install: ${lib_path}/hawkes/simulation/build
-    out: _hawkes_simulation${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/hawkes/simulation/hawkes_simulation_module.i, inc: include swig}}
 
   - name: hawkes/inference
     parent: arg
@@ -118,7 +125,8 @@ profile:
       ./cpp/hawkes/inference
       ./swig/tick/hawkes/inference
     install: ${lib_path}/hawkes/inference/build
-    out: _hawkes_inference${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/hawkes/inference/hawkes_inference_module.i, inc: include swig}}
 
   - name: linear_model
     parent: arg
@@ -127,7 +135,8 @@ profile:
       ./cpp/linear_model
       ./swig/tick/linear_model
     install: ${lib_path}/linear_model/build
-    out: _linear_model${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/linear_model/linear_model_module.i, inc: include swig}}
 
   - name: prox
     parent: arg
@@ -136,7 +145,8 @@ profile:
       ./cpp/prox
       ./swig/tick/prox
     install: ${lib_path}/prox/build
-    out: _prox${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/linear_model/linear_model_module.i, inc: include swig}}
 
   - name: preprocessing
     parent: arg
@@ -145,7 +155,8 @@ profile:
       ./cpp/preprocessing
       ./swig/tick/preprocessing
     install: ${lib_path}/preprocessing/build
-    out: _preprocessing${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/preprocessing/preprocessing_module.i, inc: include swig}}
 
   - name: random
     parent: arg
@@ -154,7 +165,8 @@ profile:
       ./cpp/random
       ./swig/tick/random
     install: ${lib_path}/random/build
-    out: _crandom${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/random/random_module.i, inc: include swig}}
 
   - name: robust
     parent: arg
@@ -163,7 +175,8 @@ profile:
       ./cpp/robust
       ./swig/tick/robust
     install: ${lib_path}/robust/build
-    out: _robust${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/robust/robust_module.i, inc: include swig}}
 
   - name: solver
     parent: arg
@@ -172,7 +185,8 @@ profile:
       ./cpp/solver
       ./swig/tick/solver
     install: ${lib_path}/solver/build
-    out: _solver${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/solver/solver_module.i, inc: include swig}}
 
   - name: survival
     parent: arg
@@ -181,13 +195,8 @@ profile:
       ./cpp/survival
       ./swig/tick/survival
     install: ${lib_path}/survival/build
-    out: _survival${lib_name}
-
-  - name: serialization
-    parent: arg
-    self: linear_model solver prox robust survival
-    install: ${lib_path}/serialization/build
-    out: _serialization${lib_name}
+    mod: |
+      lang.swig{compile{src: swig/tick/survival/survival_module.i, inc: include swig}}
 
 ### See file ./sh/gtest/sh
   - name: exe