ernie-renderer 0.2.0.dev3__tar.gz → 0.2.0.dev5__tar.gz

{ernie_renderer-0.2.0.dev3 → ernie_renderer-0.2.0.dev5}/.github/workflows/ci.yml

@@ -213,10 +213,17 @@ jobs:
 
   # DEB, RPM and TGZ of the ernie program, built on manylinux_2_34 so they run on glibc 2.34 or later.
   packages:
+    name: packages (${{ matrix.arch }})
     needs: version
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 30
-    container: quay.io/pypa/manylinux_2_34_x86_64
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { arch: x86_64, runner: ubuntu-24.04 }
+          - { arch: aarch64, runner: ubuntu-24.04-arm }
+    container: quay.io/pypa/manylinux_2_34_${{ matrix.arch }}
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Version
@@ -234,7 +241,7 @@ jobs:
           cd build/package && cpack -G "DEB;RPM;TGZ"
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
-          name: packages-linux-x86_64
+          name: packages-linux-${{ matrix.arch }}
           path: |
             build/package/packages/*.deb
             build/package/packages/*.rpm
@@ -242,35 +249,37 @@ jobs:
 
   # Each package installed on a clean distribution, where the program must find lavapipe.
   package-test:
-    name: package-test (${{ matrix.image }})
+    name: package-test (${{ matrix.image }}, ${{ matrix.arch }})
     needs: packages
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { image: "ubuntu:22.04", kind: deb }
-          - { image: "ubuntu:24.04", kind: deb }
-          - { image: "debian:12", kind: deb }
-          - { image: "rockylinux/rockylinux:9", kind: rpm }
+        arch: [x86_64, aarch64]
+        image: ["ubuntu:22.04", "ubuntu:24.04", "debian:12", "rockylinux/rockylinux:9"]
     container: ${{ matrix.image }}
     steps:
       - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
-          name: packages-linux-x86_64
+          name: packages-linux-${{ matrix.arch }}
       - name: Install
-        if: matrix.kind == 'deb'
+        if: ${{ !startsWith(matrix.image, 'rockylinux') }}
         run: |
           apt-get update
           apt-get install -y --no-install-recommends ./*.deb mesa-vulkan-drivers
       - name: Install
-        if: matrix.kind == 'rpm'
-        run: dnf install -y ./*.rpm mesa-vulkan-drivers
+        if: ${{ startsWith(matrix.image, 'rockylinux') }}
+        run: dnf install -y ./*.rpm
+      # Rocky 9 has no lavapipe for aarch64, so there the program is only run, not given a device.
+      - name: Install lavapipe
+        if: ${{ startsWith(matrix.image, 'rockylinux') && matrix.arch == 'x86_64' }}
+        run: dnf install -y mesa-vulkan-drivers
       - name: Run
-        run: |
-          ernie --version
-          ernie --devices | grep -i llvmpipe
+        run: ernie --version
+      - name: List devices
+        if: ${{ !(startsWith(matrix.image, 'rockylinux') && matrix.arch == 'aarch64') }}
+        run: ernie --devices | grep -i llvmpipe
 
   # The ernie program's image, built from source; pushed to GHCR from main (dev) and release tags.
   docker:

{ernie_renderer-0.2.0.dev3 → ernie_renderer-0.2.0.dev5}/CMakeLists.txt

@@ -10,7 +10,7 @@ project(
 )
 
 # Pre-release suffix such as .dev12, written by CI.
-set(ERNIE_VERSION_SUFFIX ".dev3" CACHE STRING "Pre-release suffix of Ernie's version")
+set(ERNIE_VERSION_SUFFIX ".dev5" CACHE STRING "Pre-release suffix of Ernie's version")
 set(ERNIE_VERSION "${PROJECT_VERSION}${ERNIE_VERSION_SUFFIX}")
 
 option(ERNIE_BUILD_TESTS "Build Ernie's tests" OFF)

{ernie_renderer-0.2.0.dev3 → ernie_renderer-0.2.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ernie-renderer
-Version: 0.2.0.dev3
+Version: 0.2.0.dev5
 Summary: Efficient Renderer for Natural and Interplanetary Environments: a physically based, spectral Vulkan ray tracer
 Author: Alex Maietta
 License-Expression: BSD-3-Clause
@@ -109,8 +109,7 @@ sudo dnf install ./ernie-*.rpm
 The `ernie` program is also published as a Docker image.
 
 ```sh
-docker run --rm --gpus all -v "$PWD:/out" ghcr.io/alexmaietta/ernie \
-  --demo demo_atmosphere_earth --viewer null --output /out/earth.png
+docker run --rm --gpus all -v "$PWD:/out" ghcr.io/alexmaietta/ernie --demo demo_atmosphere_earth --viewer null --output /out/earth.png
 ```
 
 ### Build from source

{ernie_renderer-0.2.0.dev3 → ernie_renderer-0.2.0.dev5}/README.md

@@ -94,8 +94,7 @@ sudo dnf install ./ernie-*.rpm
 The `ernie` program is also published as a Docker image.
 
 ```sh
-docker run --rm --gpus all -v "$PWD:/out" ghcr.io/alexmaietta/ernie \
-  --demo demo_atmosphere_earth --viewer null --output /out/earth.png
+docker run --rm --gpus all -v "$PWD:/out" ghcr.io/alexmaietta/ernie --demo demo_atmosphere_earth --viewer null --output /out/earth.png
 ```
 
 ### Build from source

{ernie_renderer-0.2.0.dev3 → ernie_renderer-0.2.0.dev5}/cmake/ErniePackaging.cmake

@@ -9,6 +9,8 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/alexmaietta/ernie")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_DIRECTORY "${PROJECT_BINARY_DIR}/packages")
+# Archives named for their architecture, so x86_64 and aarch64 tarballs can sit side by side.
+set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_COMPONENTS_ALL app)
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_DEB_COMPONENT_INSTALL ON)