diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd123d3..7491b6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,8 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Install nauty - run: sudo apt-get install -y libnauty2-dev + - name: Install dependencies + run: sudo apt-get -y install liblapack-dev libbz2-dev libnauty-dev if: matrix.os == 'ubuntu-latest' - name: Install CLP (MacOS) run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index ebfd65e..bd8b458 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.0) +cmake_minimum_required(VERSION 3.28) project(StableSolver LANGUAGES CXX) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index a348248..c294508 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -15,7 +15,7 @@ FetchContent_MakeAvailable(Boost) FetchContent_Declare( optimizationtools GIT_REPOSITORY https://github.com/fontanf/optimizationtools.git - GIT_TAG a0973a7dfa64b9d305f75879c80d252e714ce2cf + GIT_TAG 65c8e11224aac1cf6e6e33c040b6b895341ad156 #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../optimizationtools/" EXCLUDE_FROM_ALL) FetchContent_MakeAvailable(optimizationtools) @@ -39,7 +39,7 @@ endif() FetchContent_Declare( mathoptsolverscmake GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git - GIT_TAG 80cd13a843e2c10684abbfe76cf9aae0d71ff79d + GIT_TAG 4472814a28a40f4d861ccd757e140835c3a31bd0 #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/" EXCLUDE_FROM_ALL) FetchContent_MakeAvailable(mathoptsolverscmake) diff --git a/scripts/download_data.py b/scripts/download_data.py index 13ef0c8..2d1dc65 100644 --- a/scripts/download_data.py +++ b/scripts/download_data.py @@ -3,6 +3,8 @@ import os import shutil import pathlib +import time +import sys parser = argparse.ArgumentParser(description='') @@ -13,8 +15,18 @@ help='') args = parser.parse_args() +def download(id): + for _ in range(3): + try: + gdown.download(id=id, output="data.7z") + except: + time.sleep(10) + continue + return + sys.exit(1) + if args.data is None: - gdown.download(id="1OUJqeX9IMlRczq4Ycta-lppcnGgFJd2E", output="data.7z") + download("1OUJqeX9IMlRczq4Ycta-lppcnGgFJd2E") os.system("7z x data.7z") pathlib.Path("data.7z").unlink() shutil.copytree("stable", "data", dirs_exist_ok=True) diff --git a/src/clique/algorithms/local_search.cpp b/src/clique/algorithms/local_search.cpp index 9c68618..4637dcd 100644 --- a/src/clique/algorithms/local_search.cpp +++ b/src/clique/algorithms/local_search.cpp @@ -555,7 +555,7 @@ const Output stablesolver::clique::local_search( llsbfls_parameters.initial_solution_ids = std::vector( llsbfls_parameters.number_of_threads_2, 0); bool end = false; - llsbfls_parameters.timer.set_end_boolean(&end); + llsbfls_parameters.timer.add_end_boolean(&end); llsbfls_parameters.new_solution_callback = [&instance, &output, &algorithm_formatter, &end]( const localsearchsolver::Output& lss_output)