Skip to content

Commit d27f57a

Browse files
csparker247csparker247
authored
Texturing performance improvements (#71)
1 parent 1c67b0f commit d27f57a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1101
-1351
lines changed

‎.github/workflows/build_packages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
package_name: ${{ steps.name_pkg.outputs.package_name }}
1616
timeout-minutes: 240
1717
env:
18-
QT_VERSION: "6.4.2"
18+
QT_VERSION: "6.6.1"
1919
EXTRA_CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=Release -DVC_PREBUILT_LIBS=ON -DVC_BUILD_ACVD=ON"
2020
steps:
2121
- name: Checkout code
@@ -67,7 +67,7 @@ jobs:
6767
ditto -c -k "${{ env.install_dir }}" ${{ env.package_name }}
6868
6969
- name: Upload artifacts
70-
uses: actions/upload-artifact@v3.1.1
70+
uses: actions/upload-artifact@v4
7171
if: success()
7272
with:
7373
name: package-macos-intel

‎.github/workflows/deploy_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
needs: macos
2828
steps:
2929
- name: Download macOS (Intel) package
30-
uses: actions/download-artifact@v3
30+
uses: actions/download-artifact@v4
3131
with:
3232
name: package-macos-intel
3333

‎.github/workflows/unit_tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ concurrency:
1111
cancel-in-progress: true
1212
jobs:
1313
debian_static:
14-
name: Debian 11 (static libraries)
14+
name: Debian 12 (static libraries)
1515
runs-on: ubuntu-latest
16-
container: ghcr.io/educelab/ci-docker:11_v2.static
16+
container: ghcr.io/educelab/ci-docker:static.12.0
1717
if: ${{ github.event_name }} == "merge_request_event" || !(${{ github.ref }} && $CI_OPEN_MERGE_REQUESTS) || ${{ github.ref }}
1818
timeout-minutes: 180
1919
env:
20-
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
21-
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.4.2/"
20+
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
21+
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.6.1/"
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@v3.3.0
@@ -34,14 +34,14 @@ jobs:
3434
run: ctest -V --test-dir build/
3535

3636
debian_dynamic:
37-
name: Debian 11 (shared libraries)
37+
name: Debian 12 (shared libraries)
3838
runs-on: ubuntu-latest
39-
container: ghcr.io/educelab/ci-docker:11_v2.dynamic
39+
container: ghcr.io/educelab/ci-docker:dynamic.12.0
4040
if: ${{ github.event_name }} == "merge_request_event" || !(${{ github.ref }} && $CI_OPEN_MERGE_REQUESTS) || ${{ github.ref }}
4141
timeout-minutes: 180
4242
env:
43-
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DBUILD_SHARED_LIBS=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
44-
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.4.2/"
43+
EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
44+
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.6.1/"
4545
steps:
4646
- name: Checkout code
4747
uses: actions/checkout@v3.3.0

‎.gitlab-ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
- release
88

99
variables:
10-
MACOSX_DEPLOYMENT_TARGET: "11.3"
10+
MACOSX_DEPLOYMENT_TARGET: "12.7"
1111

1212
### Prototype build jobs ###
1313
.build_script: &build_script
@@ -55,9 +55,9 @@ test:debian:static:
5555
extends: .build_and_test
5656
stage: test
5757
needs: []
58-
image: ghcr.io/educelab/ci-docker:11_v2.static
58+
image: ghcr.io/educelab/ci-docker:static.12.0
5959
variables:
60-
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.4.2/"
60+
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.6.1/"
6161
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
6262
tags:
6363
- docker
@@ -66,9 +66,9 @@ test:debian:dynamic:
6666
extends: .build_and_test
6767
stage: test
6868
needs: []
69-
image: ghcr.io/educelab/ci-docker:11_v2.dynamic
69+
image: ghcr.io/educelab/ci-docker:dynamic.12.0
7070
variables:
71-
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.4.2/"
71+
CMAKE_PREFIX_PATH: "/usr/local/Qt-6.6.1/"
7272
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DBUILD_SHARED_LIBS=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
7373
tags:
7474
- docker
@@ -79,7 +79,7 @@ test:macos:static:
7979
stage: test
8080
needs: []
8181
variables:
82-
CMAKE_PREFIX_PATH: "/usr/local/educelab/vc-deps-1.7-static-debug:/usr/local/Qt/6.4.2/macos/lib/cmake/"
82+
CMAKE_PREFIX_PATH: "/usr/local/educelab/vc-deps-1.8.1-static-debug:/usr/local/Qt/6.6.1/macos/lib/cmake/"
8383
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
8484
tags:
8585
- macos
@@ -90,7 +90,7 @@ test:macos:dynamic:
9090
stage: test
9191
needs: []
9292
variables:
93-
CMAKE_PREFIX_PATH: "/usr/local/educelab/vc-deps-1.7-dynamic-debug:/usr/local/Qt/6.4.2/macos/lib/cmake/"
93+
CMAKE_PREFIX_PATH: "/usr/local/educelab/vc-deps-1.8.1-dynamic-debug:/usr/local/Qt/6.6.1/macos/lib/cmake/"
9494
EXTRA_CMAKE_FLAGS: "-DVC_BUILD_ACVD=ON -DBUILD_SHARED_LIBS=ON -DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
9595
tags:
9696
- macos
@@ -118,7 +118,7 @@ lint:clang-format:
118118
pages:
119119
stage: docs
120120
needs: []
121-
image: ghcr.io/educelab/ci-docker:11_v2.static
121+
image: ghcr.io/educelab/ci-docker:static.12.0
122122
before_script:
123123
- apt-get -y update
124124
- apt-get install --fix-missing --fix-broken -y doxygen graphviz
@@ -164,10 +164,10 @@ pages:
164164
.collect:package:macos:
165165
extends: .build
166166
variables:
167-
CMAKE_PREFIX_PATH: "/usr/local/Qt/6.4.2/macos/lib/cmake/"
167+
CMAKE_PREFIX_PATH: "/usr/local/Qt/6.6.1/macos/lib/cmake/"
168168
CMAKE_INSTALL_PREFIX: "packaged_install/"
169169
EXTRA_CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=Release -DVC_PREBUILT_LIBS=ON -DVC_BUILD_ACVD=ON"
170-
MACOSX_DEPLOYMENT_TARGET: "12.3"
170+
MACOSX_DEPLOYMENT_TARGET: "12.7"
171171
before_script:
172172
- git submodule update --init
173173
- cmake -S vc-deps/ -B vc-deps/build/ -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_MESSAGE=NEVER -DVCDEPS_BUILD_ACVD=OFF

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM ghcr.io/educelab/ci-docker:11_v2.dynamic
1+
FROM ghcr.io/educelab/ci-docker:dynamic.12.0
22
MAINTAINER Seth Parker <c.seth.parker@uky.edu>
33

44
# Install volcart
55
COPY ./ /volume-cartographer/
6-
RUN export CMAKE_PREFIX_PATH="/usr/local/Qt-6.4.2/" \
6+
RUN export CMAKE_PREFIX_PATH="/usr/local/Qt-6.6.1/" \
77
&& cmake \
88
-S /volume-cartographer/ \
99
-B /volume-cartographer/build/ \
1010
-GNinja \
1111
-DCMAKE_BUILD_TYPE=Release \
12-
-DCMAKE_INSTALL_RPATH=/usr/local/Qt-6.4.2/lib \
12+
-DCMAKE_INSTALL_RPATH=/usr/local/Qt-6.6.1/lib \
1313
-DVC_BUILD_ACVD=ON \
1414
&& cmake --build /volume-cartographer/build/ \
1515
&& cmake --install /volume-cartographer/build/ \

0 commit comments

Comments
 (0)