Skip to content

feat: add support for LoongArch64 architecture #5243

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

Draft
xflcx1991 wants to merge 1 commit into
base: main
Choose a base branch
from
+446 −546
Draft

feat: add support for LoongArch64 architecture #5243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
959 changes: 415 additions & 544 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,26 @@ zstd = { version = "0.13.3", default-features = false }
reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
# Patch rattler for LoongArch64 support until official release
# Need to patch all rattler crates for version consistency
coalesced_map = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
file_url = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
path_resolver = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
simple_spawn_blocking = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_cache = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_conda_types = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_digest = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_lock = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_menuinst = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_networking = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_package_streaming = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_redaction = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_repodata_gateway = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_shell = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_solve = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_upload = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }
rattler_virtual_packages = { git = "https://github.com/conda/rattler", rev = "ab42cbeb63dbe08d28218007168236f32e088092" }

[profile.ci]
codegen-units = 16
Expand Down
2 changes: 1 addition & 1 deletion ...ifests/snapshots/pixi_manifest__manifests__workspace__tests__invalid_target_specific.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
source: crates/pixi_manifest/src/manifests/workspace.rs
expression: "expect_parse_failure(&format!(\"{PROJECT_BOILERPLATE}\\n{}\", examples[0]))"
---
× 'foobar' is not a known platform. Valid platforms are 'noarch', 'unknown', 'linux-32', 'linux-64', 'linux-aarch64', 'linux-armv6l', 'linux-armv7l', 'linux-loong64', 'linux-ppc64le', 'linux-
× 'foobar' is not a known platform. Valid platforms are 'noarch', 'unknown', 'linux-32', 'linux-64', 'linux-aarch64', 'linux-armv6l', 'linux-armv7l', 'linux-loongarch64', 'linux-ppc64le', 'linux-
│ ppc64', 'linux-ppc', 'linux-s390x', 'linux-riscv32', 'linux-riscv64', 'freebsd-64', 'osx-64', 'osx-arm64', 'win-32', 'win-64', 'win-arm64', 'emscripten-wasm32', 'wasi-wasm32', 'zos-z'
╭─[pixi.toml:8:9]
7 │
Expand Down
4 changes: 4 additions & 0 deletions crates/pixi_manifest/src/toml/platform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ pub enum TomlPlatform {
LinuxRiscv32,
LinuxRiscv64,

#[strum(serialize = "linux-loongarch64")]
LinuxLoongArch64,

#[strum(serialize = "osx-64")]
Osx64,
OsxArm64,
Expand Down Expand Up @@ -57,6 +60,7 @@ impl From<TomlPlatform> for Platform {
TomlPlatform::LinuxS390X => Platform::LinuxS390X,
TomlPlatform::LinuxRiscv32 => Platform::LinuxRiscv32,
TomlPlatform::LinuxRiscv64 => Platform::LinuxRiscv64,
TomlPlatform::LinuxLoongArch64 => Platform::LinuxLoongArch64,
TomlPlatform::Osx64 => Platform::Osx64,
TomlPlatform::OsxArm64 => Platform::OsxArm64,
TomlPlatform::Win32 => Platform::Win32,
Expand Down
2 changes: 2 additions & 0 deletions ...es/pixi_manifest/src/toml/snapshots/pixi_manifest__toml__platform__test__deserialize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: crates/pixi_manifest/src/toml/platform.rs
assertion_line: 97
expression: "TomlPlatform::VARIANTS"
---
[
Expand All @@ -13,6 +14,7 @@ expression: "TomlPlatform::VARIANTS"
"linux-s390x",
"linux-riscv32",
"linux-riscv64",
"linux-loongarch64",
"osx-64",
"osx-arm64",
"win-32",
Expand Down
1 change: 1 addition & 0 deletions crates/pypi_modifiers/src/pypi_marker_env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub fn determine_marker_environment(
Platform::LinuxS390X => "s390x",
Platform::LinuxRiscv32 => "riscv32",
Platform::LinuxRiscv64 => "riscv64",
Platform::LinuxLoongArch64 => "loongarch64",
Platform::Osx64 => "x86_64",
Platform::OsxArm64 => "arm64",
Platform::Win32 => "x86",
Expand Down
2 changes: 1 addition & 1 deletion crates/pypi_modifiers/src/pypi_tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fn get_arch_tags(platform: Platform) -> Result<uv_platform_tags::Arch, PyPITagEr
Some(Arch::Ppc64) => Ok(uv_platform_tags::Arch::Powerpc64),
Some(Arch::Riscv64) => Ok(uv_platform_tags::Arch::Riscv64),
Some(Arch::S390X) => Ok(uv_platform_tags::Arch::S390X),
Some(Arch::Loong64) => Ok(uv_platform_tags::Arch::LoongArch64),
Some(Arch::LoongArch64) => Ok(uv_platform_tags::Arch::LoongArch64),
Some(unsupported_arch) => Err(PyPITagError::FailedToDetermineArchTags(unsupported_arch)),
}
}
Expand Down
1 change: 1 addition & 0 deletions schema/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class Platform(str, Enum):
linux_riscv32 = "linux-riscv32"
linux_riscv64 = "linux-riscv64"
linux_s390x = "linux-s390x"
linux_loongarch64 = "linux-loongarch64"
noarch = "noarch"
osx_64 = "osx-64"
osx_arm64 = "osx-arm64"
Expand Down
1 change: 1 addition & 0 deletions schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,6 +1330,7 @@
"linux-riscv32",
"linux-riscv64",
"linux-s390x",
"linux-loongarch64",
"noarch",
"osx-64",
"osx-arm64",
Expand Down
Loading