Skip to content

Commit

Permalink
mv env to mkn.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan committed Aug 18, 2024
1 parent ec294ea commit fbcb145
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 47 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ on:
env:
MKN_COMPILE_THREADS: 2
MKN_GCC_PREFERRED: 1
MKN_PYTHON_LIB_EMBED: 1
MKN_LIB_LINK_LIB: 1
KLOG: 3

jobs:
Expand Down Expand Up @@ -47,8 +45,10 @@ jobs:
- name: pip # tensorflow not released for 3.12 as of 26-OCT-2023
run: |
python3 -m pip install wheel pip --upgrade
python3 -m pip install -r requirements.txt
python3 -V
python3 -m pip install -U pip
python3 -m pip install -U build twine wheel setuptools
python3 -m pip install -U -r requirements.txt
[ "${{ matrix.python-version }}" != "3.12" ] && python3 -m pip install tensorflow-cpu
- name: build
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ on:

env:
MKN_COMPILE_THREADS: 2
MKN_LIB_LINK_LIB: 1
MKN_PYTHON_LIB_EMBED: 1
KLOG: 3

jobs:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/merge_master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
env:
MKN_COMPILE_THREADS: 2
MKN_GCC_PREFERRED: 1
MKN_LIB_LINK_LIB: 1
KLOG: 3

jobs:
Expand All @@ -27,7 +26,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312']
python-version: ['cp311-cp311', 'cp312-cp312']

steps:
- name: add Python dir to path
Expand Down Expand Up @@ -65,7 +64,7 @@ jobs:
max-parallel: 4
matrix:
os: [windows-latest]
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.11', '3.12']

runs-on: ${{ matrix.os }}

Expand Down
79 changes: 41 additions & 38 deletions lib/mkn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,47 @@ property:


profile:
- name: arg
arg: ${cargs}
inc:
./include
./third_party/cereal/include
if_arg:
win: ${win_cargs}
nix: ${nixish_cargs}
bsd: ${nixish_cargs}
if_link:
nix_lib: ${nix_largs}
bsd_lib: ${bsd_largs}
win: -LTCG
mod: |
lang.python3{compile:{with: numpy}, link:{delete: CoreFoundation -framework }}
- name: arg
arg: ${cargs}
inc:
./include
./third_party/cereal/include
if_arg:
win: ${win_cargs}
nix: ${nixish_cargs}
bsd: ${nixish_cargs}
if_link:
nix_lib: ${nix_largs}
bsd_lib: ${bsd_largs}
win: -LTCG
mod: |
lang.python3{compile:{with: numpy}, link:{delete: CoreFoundation -framework }}
- name: tick.py
parent: arg
src: cpp swig/tick
install: ${lib_path}/tick_cpp
out: _tick_cpp
arg: -DBUILDING_DLL
mod:
- name: lang.swig
compile:
inc: include swig
src: swig/tick/module.i
outdir: ../tick/tick_cpp
objfile: tick_module_wrap.cpp
- name: tick.py
parent: arg
src: cpp swig/tick
install: ${lib_path}/tick_cpp
out: _tick_cpp
arg: -DBUILDING_DLL
mod:
- name: lang.swig
compile:
inc: include swig
src: swig/tick/module.i
outdir: ../tick/tick_cpp
objfile: tick_module_wrap.cpp
env: |
MKN_LIB_LINK_LIB=1
MKN_PYTHON_LIB_EMBED=1
- name: gtest_lib
parent: arg
arg: -DBUILDING_DLL
src: cpp
- name: gtest_lib
parent: arg
arg: -DBUILDING_DLL
src: cpp

- name: gtest
parent: arg
self: gtest_lib
dep: google.test
arg: -DGTEST_LINKED_AS_SHARED_LIBRARY -DADD_MAIN
# run: find lib/cpp-test -name "*gtest.cpp"
- name: gtest
parent: arg
self: gtest_lib
dep: google.test
arg: -DGTEST_LINKED_AS_SHARED_LIBRARY -DADD_MAIN
# run: find lib/cpp-test -name "*gtest.cpp"

0 comments on commit fbcb145

Please sign in to comment.