Merge pull request #1562 from talregev/fix/windows3

Fix windows tests
release/4.3a0
Varun Agrawal 2023-07-01 06:01:51 -04:00 committed by GitHub
commit b62aa65d0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 51 additions and 19 deletions

View File

@ -2,6 +2,12 @@ name: Linux CI
on: [pull_request] on: [pull_request]
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
build: build:
name: ${{ matrix.name }} ${{ matrix.build_type }} name: ${{ matrix.name }} ${{ matrix.build_type }}

View File

@ -2,6 +2,12 @@ name: macOS CI
on: [pull_request] on: [pull_request]
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
build: build:
name: ${{ matrix.name }} ${{ matrix.build_type }} name: ${{ matrix.name }} ${{ matrix.build_type }}

View File

@ -2,6 +2,12 @@ name: Python CI
on: [pull_request] on: [pull_request]
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
build: build:
name: ${{ matrix.name }} ${{ matrix.build_type }} Python ${{ matrix.python_version }} name: ${{ matrix.name }} ${{ matrix.build_type }} Python ${{ matrix.python_version }}

View File

@ -2,6 +2,12 @@ name: Special Cases CI
on: [pull_request] on: [pull_request]
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
build: build:
name: ${{ matrix.name }} ${{ matrix.build_type }} name: ${{ matrix.name }} ${{ matrix.build_type }}

View File

@ -2,6 +2,12 @@ name: Windows CI
on: [pull_request] on: [pull_request]
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
build: build:
name: ${{ matrix.name }} ${{ matrix.build_type }} name: ${{ matrix.name }} ${{ matrix.build_type }}
@ -16,19 +22,15 @@ jobs:
BOOST_EXE: boost_1_72_0-msvc-14.2 BOOST_EXE: boost_1_72_0-msvc-14.2
strategy: strategy:
fail-fast: true fail-fast: false
matrix: matrix:
# Github Actions requires a single row to be added to the build matrix. build_type:
# See https://help.github.com/en/articles/workflow-syntax-for-github-actions. - Debug
name: [ - Release
windows-2019-cl,
]
build_type: [ build_unstable:
Debug, - ON
Release # - OFF
]
build_unstable: [ON]
include: include:
- name: windows-2019-cl - name: windows-2019-cl
os: windows-2019 os: windows-2019
@ -87,10 +89,15 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Setup msbuild
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x${{ matrix.platform }}
- name: Configuration - name: Configuration
run: | run: |
cmake -E remove_directory build cmake -E remove_directory build
cmake -B build -S . -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF -DBOOST_ROOT="${env:BOOST_ROOT}" -DBOOST_INCLUDEDIR="${env:BOOST_ROOT}\boost\include" -DBOOST_LIBRARYDIR="${env:BOOST_ROOT}\lib" cmake -G Ninja -B build -S . -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF -DBOOST_ROOT="${env:BOOST_ROOT}" -DBOOST_INCLUDEDIR="${env:BOOST_ROOT}\boost\include" -DBOOST_LIBRARYDIR="${env:BOOST_ROOT}\lib"
- name: Build - name: Build
run: | run: |

View File

@ -80,7 +80,7 @@ using Weights = Eigen::Matrix<double, 1, -1>; /* 1xN vector */
* *
* @ingroup basis * @ingroup basis
*/ */
Matrix kroneckerProductIdentity(size_t M, const Weights& w); Matrix GTSAM_EXPORT kroneckerProductIdentity(size_t M, const Weights& w);
/** /**
* CRTP Base class for function bases * CRTP Base class for function bases

View File

@ -21,6 +21,7 @@
#include <optional> #include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
#include <gtsam/dllexport.h>
namespace gtsam { namespace gtsam {
/** /**
@ -47,7 +48,7 @@ namespace gtsam {
* *
* Also fails if the rows are not of the same size. * Also fails if the rows are not of the same size.
*/ */
struct SignatureParser { struct GTSAM_EXPORT SignatureParser {
using Row = std::vector<double>; using Row = std::vector<double>;
using Table = std::vector<Row>; using Table = std::vector<Row>;

View File

@ -198,9 +198,9 @@ public:
static Matrix3 LogmapDerivative(const Pose2& v); static Matrix3 LogmapDerivative(const Pose2& v);
// Chart at origin, depends on compile-time flag SLOW_BUT_CORRECT_EXPMAP // Chart at origin, depends on compile-time flag SLOW_BUT_CORRECT_EXPMAP
struct ChartAtOrigin { struct GTSAM_EXPORT ChartAtOrigin {
static Pose2 Retract(const Vector3& v, ChartJacobian H = {}); static Pose2 Retract(const Vector3& v, ChartJacobian H = {});
static Vector3 Local(const Pose2& r, ChartJacobian H = {}); static Vector3 Local(const Pose2& r, ChartJacobian H = {});
}; };
using LieGroup<Pose2, 3>::inverse; // version with derivative using LieGroup<Pose2, 3>::inverse; // version with derivative

View File

@ -204,7 +204,7 @@ public:
static Matrix6 LogmapDerivative(const Pose3& xi); static Matrix6 LogmapDerivative(const Pose3& xi);
// Chart at origin, depends on compile-time flag GTSAM_POSE3_EXPMAP // Chart at origin, depends on compile-time flag GTSAM_POSE3_EXPMAP
struct ChartAtOrigin { struct GTSAM_EXPORT ChartAtOrigin {
static Pose3 Retract(const Vector6& xi, ChartJacobian Hxi = {}); static Pose3 Retract(const Vector6& xi, ChartJacobian Hxi = {});
static Vector6 Local(const Pose3& pose, ChartJacobian Hpose = {}); static Vector6 Local(const Pose3& pose, ChartJacobian Hpose = {});
}; };