Skip to content

Feature/win arm #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mliberty1 merged 2 commits into from
Apr 28, 2026
Merged

Feature/win arm #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
491221e
Added windows-11-arm64 support.
mliberty1 Apr 28, 2026
2fd4ac8
Fixed includes for Windows ARM intrinsics.
mliberty1 Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["windows-latest"] #, "windows-11-arm"]
os: ["windows-latest", "windows-11-arm"]
steps:
- name: Checkout repo
uses: actions/checkout@v6
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest", "macos-latest", "ubuntu-24.04-arm"] # , "windows-11-arm"]
os: ["ubuntu-latest", "windows-latest", "macos-latest", "ubuntu-24.04-arm", "windows-11-arm"]
python_version: ["cp311", "cp312", "cp313", "cp314"]

steps:
Expand All @@ -164,7 +164,7 @@ jobs:
run: echo "filename=$(ls dist/*.tar.gz)" >> $GITHUB_OUTPUT

- name: Build wheels
uses: pypa/cibuildwheel@v3.3
uses: pypa/cibuildwheel@v3.4.1
env:
CIBW_ARCHS_MACOS: universal2
CIBW_ARCHS_WINDOWS: native
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
This file contains the list of changes made to the JLS project.


## 0.17.0

2026 Apr 27

* Added windows-11-arm64 support.


## 0.16.0

2025 Dec 2
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cmake_minimum_required (VERSION 3.10)
set(PARENT_PROJECT_DIR ${PROJECT_SOURCE_DIR})
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) # universal2
project(JLS
VERSION 0.16.0
VERSION 0.17.0
LANGUAGES C)
SET(PROJECT_PREFIX JLS)
SET(VERSION_STRING "${PROJECT_VERSION}")
Expand Down
2 changes: 1 addition & 1 deletion include/jls/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ JLS_CPP_GUARD_START

// Use version_update.py to update.
#define JLS_VERSION_MAJOR 0
#define JLS_VERSION_MINOR 16
#define JLS_VERSION_MINOR 17
#define JLS_VERSION_PATCH 0

/**
Expand Down
2 changes: 1 addition & 1 deletion pyjls/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.


__version__ = "0.16.0"
__version__ = "0.17.0"

__title__ = "pyjls"
__description__ = 'Joulescope™ file format'
Expand Down
6 changes: 6 additions & 0 deletions src/crc32c_arm_neon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
*/

#include "jls/crc32c.h"
#if defined(_MSC_VER)
// MSVC on ARM64: __crc32cb/cw/cd are exposed through <intrin.h>, not ACLE.
// See https://learn.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics
#include <intrin.h>
#else
#include <arm_acle.h>
#include <arm_neon.h>
#endif
#include <assert.h>

// Used by Raspberry Pi 4 and new M1 Macs.
Expand Down
Loading