12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address some comments on PR

release/4.3a0
Yashas Ambati 2025-02-21 00:22:49 -05:00
parent abe4cd7727
commit 408aaeafa4
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-cibw.yml vendored
View File

@ -24,8 +24,10 @@ jobs:
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}
- name: Set Nightly Flag - name: Set Develop Flag
run: echo "NIGHTLY=1" >> $GITHUB_ENV run: |
echo "DEVELOP=1" >> $GITHUB_ENV
echo "COMMIT_HASH=$(git rev-parse --short=7 "$GITHUB_SHA")" >> $GITHUB_ENV
- name: Install Dependencies - name: Install Dependencies
run: | run: |
@ -41,7 +43,7 @@ jobs:
CIBW_BUILD: cp${{ matrix.cibw_python_version }}-${{ matrix.platform_id }} CIBW_BUILD: cp${{ matrix.cibw_python_version }}-${{ matrix.platform_id }}
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
CIBW_ARCHS: all CIBW_ARCHS: all
CIBW_ENVIRONMENT_PASS_LINUX: NIGHTLY CIBW_ENVIRONMENT_PASS_LINUX: DEVELOP COMMIT_HASH
CIBW_BUILD_FRONTEND: "build" CIBW_BUILD_FRONTEND: "build"
CIBW_BEFORE_ALL: bash {project}/build_tools/wheels/cibw_before_all.sh ${{ matrix.python_version }} {project} CIBW_BEFORE_ALL: bash {project}/build_tools/wheels/cibw_before_all.sh ${{ matrix.python_version }} {project}

7
CMakeLists.txt
View File

@ -10,10 +10,9 @@ set (GTSAM_VERSION_PATCH 0)
set (GTSAM_PRERELEASE_VERSION "a0") set (GTSAM_PRERELEASE_VERSION "a0")
math (EXPR GTSAM_VERSION_NUMERIC "10000 * ${GTSAM_VERSION_MAJOR} + 100 * ${GTSAM_VERSION_MINOR} + ${GTSAM_VERSION_PATCH}") math (EXPR GTSAM_VERSION_NUMERIC "10000 * ${GTSAM_VERSION_MAJOR} + 100 * ${GTSAM_VERSION_MINOR} + ${GTSAM_VERSION_PATCH}")
if (DEFINED ENV{NIGHTLY}) if (DEFINED ENV{DEVELOP})
string(TIMESTAMP NOW "%Y.%m.%d.%H.%M") set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}${GTSAM_PRERELEASE_VERSION}.$ENV{COMMIT_HASH}")
set (GTSAM_VERSION_STRING "${NOW}") set (SETUP_NAME "gtsam-develop")
set (SETUP_NAME "gtsam-nightly")
elseif ("${GTSAM_PRERELEASE_VERSION}" STREQUAL "") elseif ("${GTSAM_PRERELEASE_VERSION}" STREQUAL "")
set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}") set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}")
set (SETUP_NAME "gtsam") set (SETUP_NAME "gtsam")

2
build_tools/wheels/build_wheels.sh
View File

@ -4,4 +4,4 @@ set -e
set -x set -x
python -m pip install cibuildwheel python -m pip install cibuildwheel
python -m cibuildwheel build/python --output-dir wheelhouse python -m cibuildwheel build/python --output-dir wheelhouse

3
build_tools/wheels/cibw_before_all.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# This script is invoked prior to building the wheels with cibuildwheel. It is used in the build-cibw.yml workflow in .github/workflows.
# It installs the necessary dependencies and builds the wrapper module for the specified Python version.
set -e set -e
set -x set -x