Skip to content

Commit

Permalink
Fixes: Wind, num inerations, offline mode (#116)
Browse files Browse the repository at this point in the history
* Timestamp of finished calculations

* Testing number of combination heuristic

* Decreased default horizon

* Fix wind: conv from mph to m/s

* Testing offline mode

* 3 ci jobs

* osx requires full linux test
  • Loading branch information
mj-xmr authored Aug 25, 2022
1 parent 6211632 commit 780b3a9
Show file tree
Hide file tree
Showing 12 changed files with 514 additions and 108 deletions.
89 changes: 1 addition & 88 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ci-debian
name: linux-full

on:
push:
Expand Down Expand Up @@ -130,91 +130,4 @@ jobs:
with:
name: SolOptXMR-ubuntu-latest
path: /home/runner/work/SolOptXMR/SolOptXMR/build/*.png


build-macos:
runs-on: macOS-latest
env:
CCACHE_TEMPDIR: /tmp/.ccache-temp
steps:
- uses: actions/checkout@v1
with:
submodules: recursive
# Volatile cache
- name: ccache
uses: actions/cache@v2
with:
path: /Users/runner/Library/Caches/ccache
key: ccache03-${{ runner.os }}-${{ matrix.os }}-build-${{ github.sha }}
restore-keys: ccache03-${{ runner.os }}-${{ matrix.os }}-build-
# Less volatile cache
- name: data cache
uses: actions/cache@v2
with:
path: build/data/data/txt
key: data-${{ hashFiles('build/data/data/txt/**/*') }}
restore-keys: data-${{ hashFiles('build/data/data/txt/**/*') }}
# Expendable, volatile & large cache
- name: diff cache
uses: actions/cache@v2
with:
path: /tmp/diff_XMR.pkl
key: data-diff-01-${{ github.sha }}
restore-keys: |
data-diff-01-${{ github.sha }}
data-diff-01
- name: prepare environment
run: util/prep-env.sh
- name: install dependencies
run: util/deps-pull.sh
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: build generic
run: ./util/ci.sh 1


test-macos:
needs: build-macos
runs-on: macOS-latest
timeout-minutes: 120
continue-on-error: true # It will timeout and appear to have failed, so let's ignore the warning
env:
CCACHE_TEMPDIR: /tmp/.ccache-temp
steps:
- uses: actions/checkout@v1
with:
submodules: recursive
# Volatile cache
- name: ccache
uses: actions/cache@v2
with:
path: /Users/runner/Library/Caches/ccache
key: ccache03-${{ runner.os }}-${{ matrix.os }}-build-${{ github.sha }}
restore-keys: ccache03-${{ runner.os }}-${{ matrix.os }}-build-
# Less volatile cache
- name: data cache
uses: actions/cache@v2
with:
path: build/data/data/txt
key: data-${{ hashFiles('build/data/data/txt/**/*') }}
restore-keys: data-${{ hashFiles('build/data/data/txt/**/*') }}
# Expendable, volatile & large cache
- name: diff cache
uses: actions/cache@v2
with:
path: /tmp/diff_XMR.pkl
key: data-diff-01-${{ github.sha }}
restore-keys: |
data-diff-01-${{ github.sha }}
data-diff-01
- name: prepare environment
run: util/prep-env.sh
- name: install dependencies
run: util/deps-pull.sh
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: build generic
run: ./util/ci.sh 1
- name: Run production
run: python3 ./src/prod.py

174 changes: 174 additions & 0 deletions .github/workflows/minimal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
name: minimal

on:
push:
paths-ignore:
- '**.md'
pull_request:
paths-ignore:
- '**.md'

# The below variables reduce repetitions across similar targets
env:
APT_SET_CONF: |
echo "Acquire::Retries \"3\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
echo "Acquire::http::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
echo "Acquire::ftp::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
jobs:
build-ubuntu:
runs-on: ubuntu-latest
env:
CCACHE_TEMPDIR: /tmp/.ccache-temp
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v1
with:
submodules: recursive
# Volatile cache
- name: ccache
uses: actions/cache@v2
with:
path: ~/.ccache
key: ccache01-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-build-${{ github.sha }}
restore-keys: ccache01-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-build-
# Less volatile cache
- name: data cache
uses: actions/cache@v2
with:
path: externals/tsqsim/build/data/data/txt
key: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }}
restore-keys: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }}
# Expendable, volatile & large cache
- name: diff cache
uses: actions/cache@v2
with:
path: /tmp/diff_XMR.pkl
key: data-diff-01-${{ github.sha }}
restore-keys: |
data-diff-01-${{ github.sha }}
data-diff-01
# - name: deps cache
# uses: actions/cache@v2
# with:
# path: build/deps/dload
# key: deps-${{ hashFiles('build/deps/dload/*') }}
# restore-keys: deps-${{ hashFiles('build/deps/dload/*') }}
- name: prepare environment
run: util/prep-env.sh
- name: set apt conf
run: ${{env.APT_SET_CONF}}
- name: install dependencies
run: util/deps-pull.sh
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: Configure your rig
run: util/config.sh
- name: build generic
run: ./util/ci.sh 1
- uses: actions/upload-artifact@v3
with:
name: SolOptXMR-ubuntu-latest
path: /home/runner/work/SolOptXMR/SolOptXMR/build/*.png

test-ubuntu-offline:
needs: build-ubuntu
runs-on: ubuntu-latest
env:
CCACHE_TEMPDIR: /tmp/.ccache-temp
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v1
with:
submodules: recursive
# Volatile cache
- name: ccache
uses: actions/cache@v2
with:
path: ~/.ccache
key: ccache01-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-build-${{ github.sha }}
restore-keys: ccache01-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-build-
# Less volatile cache
- name: data cache
uses: actions/cache@v2
with:
path: externals/tsqsim/build/data/data/txt
key: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }}
restore-keys: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }}
# Expendable, volatile & large cache
- name: diff cache
uses: actions/cache@v2
with:
path: /tmp/diff_XMR.pkl
key: data-diff-01-${{ github.sha }}
restore-keys: |
data-diff-01-${{ github.sha }}
data-diff-01
# - name: deps cache
# uses: actions/cache@v2
# with:
# path: build/deps/dload
# key: deps-${{ hashFiles('build/deps/dload/*') }}
# restore-keys: deps-${{ hashFiles('build/deps/dload/*') }}
- name: prepare environment
run: util/prep-env.sh
- name: set apt conf
run: ${{env.APT_SET_CONF}}
- name: install dependencies
run: util/deps-pull.sh
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: Configure your rig
run: util/config.sh
- name: build generic
run: ./util/ci.sh 1
- name: Run production
run: python3 ./src/prod.py --offline-force
- uses: actions/upload-artifact@v3
with:
name: SolOptXMR-ubuntu-latest
path: /home/runner/work/SolOptXMR/SolOptXMR/build/*.png


build-macos:
runs-on: macOS-latest
env:
CCACHE_TEMPDIR: /tmp/.ccache-temp
steps:
- uses: actions/checkout@v1
with:
submodules: recursive
# Volatile cache
- name: ccache
uses: actions/cache@v2
with:
path: /Users/runner/Library/Caches/ccache
key: ccache03-${{ runner.os }}-${{ matrix.os }}-build-${{ github.sha }}
restore-keys: ccache03-${{ runner.os }}-${{ matrix.os }}-build-
# Less volatile cache
- name: data cache
uses: actions/cache@v2
with:
path: build/data/data/txt
key: data-${{ hashFiles('build/data/data/txt/**/*') }}
restore-keys: data-${{ hashFiles('build/data/data/txt/**/*') }}
# Expendable, volatile & large cache
- name: diff cache
uses: actions/cache@v2
with:
path: /tmp/diff_XMR.pkl
key: data-diff-01-${{ github.sha }}
restore-keys: |
data-diff-01-${{ github.sha }}
data-diff-01
- name: prepare environment
run: util/prep-env.sh
- name: install dependencies
run: util/deps-pull.sh
- name: build & install the unmanaged dependencies
run: util/deps-build.sh
- name: build generic
run: ./util/ci.sh 1

Loading

0 comments on commit 780b3a9

Please sign in to comment.