Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/gurobi_version.json

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,6 @@ jobs:
with:
submodules: recursive
fetch-depth: 0
- name: Read current gurobi Version
uses: zlatko-ms/varfiletoenv@v3
with:
paths: ./.github/gurobi_version.json
- name: download-gurobi-linux
env:
GUROBI_VERSION_SHORT: ${{ env.gurobiShortVersion }}
GUROBI_VERSION: ${{ env.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ env.gurobiFolder }}
GUROBI_FILE: gurobi${{ env.gurobiVersion }}_linux64.tar.gz
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }}
tar -xvzf ${{ env.GUROBI_FILE }}
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v4
Expand Down
112 changes: 2 additions & 110 deletions .github/workflows/cpp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,51 +21,13 @@ env:
CTEST_PARALLEL_LEVEL: 4

jobs:
read-parameters:
name: read-parameters
runs-on: ubuntu-latest
outputs:
gurobiVersion: ${{ steps.set-output.outputs.gurobiVersion }}
gurobiShortVersion: ${{ steps.set-output.outputs.gurobiShortVersion }}
gurobiFolder: ${{ steps.set-output.outputs.gurobiFolder }}
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
- name: Read current gurobi Version
uses: zlatko-ms/varfiletoenv@v3
with:
paths: ./.github/gurobi_version.json
- name: Export variables for next jobs
id: set-output
run: |
echo "gurobiVersion=${{ env.gurobiVersion }}" >> $GITHUB_OUTPUT
echo "gurobiShortVersion=${{ env.gurobiShortVersion }}" >> $GITHUB_OUTPUT
echo "gurobiFolder=${{ env.gurobiFolder }}" >> $GITHUB_OUTPUT
cpp-ubuntu-latest:
name: cpp-ubuntu-latest
runs-on: ubuntu-latest
needs: read-parameters
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
- name: setup-gurobi-license
id: write-license
env:
GUROBI_LICENSE: ${{ secrets.GUROBI_LICENSE }}
run: |
echo "$GUROBI_LICENSE" > $PWD/gurobi.lic
echo "GRB_LICENSE_FILE=$PWD/gurobi.lic" >> $GITHUB_ENV
- name: download-gurobi-linux
env:
GUROBI_VERSION_SHORT: ${{ needs.read-parameters.outputs.gurobiShortVersion }}
GUROBI_VERSION: ${{ needs.read-parameters.outputs.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ needs.read-parameters.outputs.gurobiFolder }}
GUROBI_FILE: gurobi${{ needs.read-parameters.outputs.gurobiVersion }}_linux64.tar.gz
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }}
tar -xvzf ${{ env.GUROBI_FILE }}
- name: Configure CMake
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON ${{ matrix.config.toolchain }}
- name: Build
Expand All @@ -75,27 +37,10 @@ jobs:
cpp-macos-latest:
name: cpp-macos-latest
runs-on: macos-latest
needs: read-parameters
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
- name: setup-gurobi-license
id: write-license
env:
GUROBI_LICENSE: ${{ secrets.GUROBI_LICENSE_TWO }}
run: |
echo "$GUROBI_LICENSE" > $PWD/gurobi.lic
echo "GRB_LICENSE_FILE=$PWD/gurobi.lic" >> $GITHUB_ENV
- name: download-gurobi-mac
env:
GUROBI_VERSION_SHORT: ${{ needs.read-parameters.outputs.gurobiShortVersion }}
GUROBI_VERSION: ${{ needs.read-parameters.outputs.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ needs.read-parameters.outputs.gurobiFolder }}
GUROBI_FILE: gurobi${{ needs.read-parameters.outputs.gurobiVersion }}_macos_universal2.pkg
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }}
sudo installer -pkg ${{ env.GUROBI_FILE }} -target /
- name: Configure Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
Expand All @@ -109,46 +54,11 @@ jobs:
cpp-windows-latest:
name: cpp-windows-latest
runs-on: windows-latest
needs:
- cpp-macos-latest
- read-parameters
needs: cpp-macos-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
- name: setup-gurobi-license
id: write-license
env:
GUROBI_LICENSE: ${{ secrets.GUROBI_LICENSE_TWO }}
run: |
echo "$GUROBI_LICENSE" > $PWD/gurobi.lic
echo "GRB_LICENSE_FILE=$PWD/gurobi.lic" >> $GITHUB_ENV
- name: download-gurobi-windows
shell: powershell
env:
GUROBI_VERSION_SHORT: ${{ needs.read-parameters.outputs.gurobiShortVersion }}
GUROBI_VERSION: ${{ needs.read-parameters.outputs.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ needs.read-parameters.outputs.gurobiFolder }}
GUROBI_FILE: Gurobi-${{ needs.read-parameters.outputs.gurobiVersion }}-win64.msi
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }} -OutFile ${{ env.GUROBI_FILE }}
New-Item -itemType directory gurobi
$proc = Start-Process msiexec.exe -ArgumentList "/a ${{ env.GUROBI_FILE }} /qb /L*! install.log TARGETDIR=$PWD\gurobi" -NoNewWindow -PassThru
$timeouted = $null
$proc | Wait-Process -Timeout 120 -ErrorAction SilentlyContinue -ErrorVariable timeouted
if ($timeouted)
{
echo "TIMEOUT"
$proc.Kill()
}
cat install.log
ls $PWD\gurobi
- name: set-gurobi-env-variables
id: gurobi-env-variables
shell: powershell
run: |
echo "GUROBI_HOME=$PWD\gurobi\${{ needs.read-parameters.outputs.gurobiFolder }}\win64" >> $env:GITHUB_ENV
echo "$PWD\gurobi\${{ needs.read-parameters.outputs.gurobiFolder }}\win64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Configure CMake
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON ${{ matrix.config.toolchain }}
- name: Build
Expand All @@ -158,29 +68,11 @@ jobs:
coverage:
name: Coverage
runs-on: ubuntu-latest
needs:
- cpp-ubuntu-latest
- read-parameters
needs: cpp-ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
- name: setup-gurobi-license
id: write-license
env:
GUROBI_LICENSE: ${{ secrets.GUROBI_LICENSE }}
run: |
echo "$GUROBI_LICENSE" > $PWD/gurobi.lic
echo "GRB_LICENSE_FILE=$PWD/gurobi.lic" >> $GITHUB_ENV
- name: download-gurobi-linux
env:
GUROBI_VERSION_SHORT: ${{ needs.read-parameters.outputs.gurobiShortVersion }}
GUROBI_VERSION: ${{ needs.read-parameters.outputs.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ needs.read-parameters.outputs.gurobiFolder }}
GUROBI_FILE: gurobi${{ needs.read-parameters.outputs.gurobiVersion }}_linux64.tar.gz
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }}
tar -xvzf ${{ env.GUROBI_FILE }}
- name: Configure CMake
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DENABLE_COVERAGE=ON
- name: Build
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/cpp-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@ jobs:
fi
echo "CC=clang-${{ env.clang-version }}" >> $GITHUB_ENV
echo "CXX=clang++-${{ env.clang-version }}" >> $GITHUB_ENV
- name: Read current gurobi Version
uses: zlatko-ms/varfiletoenv@v3
with:
paths: ./.github/gurobi_version.json
- name: download-gurobi-linux
env:
GUROBI_VERSION_SHORT: ${{ env.gurobiShortVersion }}
GUROBI_VERSION: ${{ env.gurobiVersion }}
GUROBI_VERSION_FOLDER: ${{ env.gurobiFolder }}
GUROBI_FILE: gurobi${{ env.gurobiVersion }}_linux64.tar.gz
run: |
wget https://packages.gurobi.com/${{ env.GUROBI_VERSION_SHORT }}/${{ env.GUROBI_FILE }}
tar -xvzf ${{ env.GUROBI_FILE }}
- name: Generate compilation database
run: |
echo $CC
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/gurobi-auto-update.yml

This file was deleted.

6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ if(MSVC AND MT)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
endif()

find_package(Gurobi REQUIRED)

if(NOT GUROBI_FOUND)
message(WARNING "Did not find Gurobi")
endif()

# add main library code
add_subdirectory(src)

Expand Down
8 changes: 0 additions & 8 deletions apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,4 @@ macro(ADD_SIM_EXECUTABLE appname)
target_link_libraries(${PROJECT_NAME}_${appname} PRIVATE ${PROJECT_NAME} ${ARGN})
endmacro()

add_sim_executable(vss_generation_timetable_mip_testing)
add_sim_executable(vss_generation_timetable_mip_iterative_vss_testing)
add_sim_executable(vss_generation_timetable_iterative_parameter_testing)
add_sim_executable(vss_generation_timetable_using_mb_information_testing)
add_sim_executable(gen_po_moving_block_lazy_vss_gen_testing)
add_sim_executable(gen_po_moving_block_lazy_testing)
add_sim_executable(gen_po_moving_block_simplified_vss_gen_testing)
add_sim_executable(gen_po_moving_block_simplified_testing)
add_sim_executable(gen_po_moving_block_astar_testing)
91 changes: 0 additions & 91 deletions apps/gen_po_moving_block_lazy_testing.cpp

This file was deleted.

Loading
Loading