Commit 137bc6f7 authored by Markus Mirz's avatar Markus Mirz
Browse files

add windows build workflow


Signed-off-by: Markus Mirz's avatarMarkus Mirz <mmirz@eonerc.rwth-aachen.de>
parent a6aeda75
on:
# Trigger the workflow on push or pull request,
# but only for the master branch
push:
branches:
- master
jobs:
windows:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- id: build
run: |
cd ${{ github.workspace }}
mkdir build
cd build
git describe --tags --abbrev=0 --match "v*"
cmake -WITH_PYTHON=OFF ..
cmake --build .
\ No newline at end of file
......@@ -125,7 +125,6 @@ find_package(VILLASnode)
if(NOT PYBIND)
find_package(PythonInterp 3.6)
find_package(PythonLibs 3.6)
find_package(NumPy)
if(PythonInterp_FOUND AND PythonLibs_FOUND)
set(Python_FOUND ON)
......
......@@ -32,15 +32,15 @@ void OpenMPLevelScheduler::createSchedule(const Task::List& tasks, const Edges&
}
void OpenMPLevelScheduler::step(Real time, Int timeStepCount) {
size_t i = 0, level = 0;
long i, level = 0;
std::chrono::steady_clock::time_point start, end;
if (!mOutMeasurementFile.empty()) {
#pragma omp parallel shared(time,timeStepCount) private(level, i, start, end) num_threads(mNumThreads)
for (level = 0; level < mLevels.size(); level++) {
for (level = 0; level < static_cast<long>(mLevels.size()); level++) {
{
#pragma omp for schedule(static)
for (i = 0; i < mLevels[level].size(); i++) {
for (i = 0; i < static_cast<long>(mLevels[level].size()); i++) {
start = std::chrono::steady_clock::now();
mLevels[level][i]->execute(time, timeStepCount);
end = std::chrono::steady_clock::now();
......@@ -50,10 +50,10 @@ void OpenMPLevelScheduler::step(Real time, Int timeStepCount) {
}
} else {
#pragma omp parallel shared(time,timeStepCount) private(level, i) num_threads(mNumThreads)
for (level = 0; level < mLevels.size(); level++) {
for (level = 0; level < static_cast<long>(mLevels.size()); level++) {
{
#pragma omp for schedule(static)
for (i = 0; i < mLevels[level].size(); i++) {
for (i = 0; i < static_cast<long>(mLevels[level].size()); i++) {
mLevels[level][i]->execute(time, timeStepCount);
}
}
......
......@@ -68,7 +68,7 @@ function(GetVersion DIR PREFIX)
set(VARIANT "release")
endif()
if(DEFINED ENV{CI})
if((DEFINED ENV{CI}) AND (DEFINED ENV{CI_COMMIT_SHA}))
string(APPEND VARIANT "-ci")
string(SUBSTRING $ENV{CI_COMMIT_SHA} 0 7 GIT_REV)
set(GIT_BRANCH $ENV{CI_COMMIT_REF_NAME})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment