From 6fa0731f7f32c68645f0f60b1c1c89771b1c8061 Mon Sep 17 00:00:00 2001 From: Pall Melsted Date: Wed, 30 Jun 2021 12:17:59 +0000 Subject: [PATCH] Fixes build issues on centos5 --- .github/workflows/release.yml | 2 +- .../include/cppoptlib/solver/lbfgsbsolver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 637aa73..5f8e4d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: run: echo ::set-output name=RELEASE_VERSION::${GITHUB_REF##*/} - name: Build run: | - docker run --rm dockbuild/centos7:latest > ./dockbuild \ + docker run --rm dockbuild/centos5:latest > ./dockbuild \ && chmod +x ./dockbuild \ && ./dockbuild -a "-e RELEASE_OS=$RELEASE_OS -e RELEASE_VERSION=$RELEASE_VERSION" bash -c "make -f Makefile.release build && make -f Makefile.release compile_release_$RELEASE_OS" env: diff --git a/dependencies/CppNumericalSolvers-v1/include/cppoptlib/solver/lbfgsbsolver.h b/dependencies/CppNumericalSolvers-v1/include/cppoptlib/solver/lbfgsbsolver.h index bad97da..d5fbbd9 100644 --- a/dependencies/CppNumericalSolvers-v1/include/cppoptlib/solver/lbfgsbsolver.h +++ b/dependencies/CppNumericalSolvers-v1/include/cppoptlib/solver/lbfgsbsolver.h @@ -243,7 +243,7 @@ class LbfgsbSolver : public ISolver { TVector x_old = x; TVector g_old = g; // STEP 2: compute the cauchy point - TVector CauchyPoint = TVector::Zero(DIM); + TVector CauchyPoint = Superclass::TVector::Zero(DIM); VariableTVector c = VariableTVector::Zero(W.cols()); getGeneralizedCauchyPoint(problem, x, g, CauchyPoint, c); // STEP 3: compute a search direction d_k by the primal method for the sub-problem