Skip to content
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

Update WasmEdge version to 0.14.1 across all configurations and docs #346

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Update WasmEdge version to 0.14.1 across all configurations and docs #346

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
270de1d
Update WasmEdge version to 0.14.1 across all configurations and docs
joulei Jan 15, 2025
877539d
Revert Windows wasn_nn plugin URLs to v0.14.0
joulei Jan 15, 2025
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
10 changes: 5 additions & 5 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install WasmEdge
run: |
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1
source $HOME/.wasmedge/env
- name: Install dependencies
run: |
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:

- name: Install WasmEdge
run: |
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1
source $HOME/.wasmedge/env

- name: Install Rust-stable
Expand All @@ -92,7 +92,7 @@ jobs:
matrix:
rust: [1.79]
env:
WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge-0.14.0-Windows
WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge-0.14.1-Windows
steps:
- name: Display ENV
run: |
Expand All @@ -104,8 +104,8 @@ jobs:
- name: Download WasmEdge
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.0/WasmEdge-0.14.0-windows.zip" -OutFile "WasmEdge-0.14.0-windows.zip"
Expand-Archive -LiteralPath "WasmEdge-0.14.0-windows.zip" -DestinationPath ${{ github.workspace }}
Invoke-WebRequest -Uri "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.1/WasmEdge-0.14.1-windows.zip" -OutFile "WasmEdge-0.14.1-windows.zip"
Expand-Archive -LiteralPath "WasmEdge-0.14.1-windows.zip" -DestinationPath ${{ github.workspace }}
tree /F ${{ github.workspace }}\WasmEdge

- name: Set up Windows 10 SDK
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: Install WasmEdge
run: |
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1
source $HOME/.wasmedge/env
- name: Install dependencies
run: |
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

- name: Install WasmEdge
run: |
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1
source $HOME/.wasmedge/env

- name: Install Rust-stable
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
matrix:
rust: [1.79]
env:
WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge-0.14.0-Windows
WASMEDGE_DIR: ${{ github.workspace }}\WasmEdge-0.14.1-Windows
steps:
- name: Display ENV
run: |
Expand All @@ -131,8 +131,8 @@ jobs:
- name: Download WasmEdge
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.0/WasmEdge-0.14.0-windows.zip" -OutFile "WasmEdge-0.14.0-windows.zip"
Expand-Archive -LiteralPath "WasmEdge-0.14.0-windows.zip" -DestinationPath ${{ github.workspace }}
Invoke-WebRequest -Uri "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.1/WasmEdge-0.14.1-windows.zip" -OutFile "WasmEdge-0.14.1-windows.zip"
Expand-Archive -LiteralPath "WasmEdge-0.14.1-windows.zip" -DestinationPath ${{ github.workspace }}
tree /F ${{ github.workspace }}\WasmEdge

- name: Set up Windows 10 SDK
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ bins = ["/usr/bin/curl"]
[package.metadata.packager.macos]
minimum_system_version = "11.0"
frameworks = [
"./wasmedge/WasmEdge-0.14.0-Darwin/lib/libwasmedge.0.dylib",
"./wasmedge/WasmEdge-0.14.0-Darwin/plugin/libwasmedgePluginWasiNN.dylib",
"./wasmedge/WasmEdge-0.14.1-Darwin/lib/libwasmedge.0.dylib",
"./wasmedge/WasmEdge-0.14.1-Darwin/plugin/libwasmedgePluginWasiNN.dylib",
]


Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ git clone https://github.com/moxin-org/moly.git
Install the required WasmEdge WASM runtime (or use [`moly-runner`](#tip-use-moly-runner-for-easy-setup)):

```sh
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1

source $HOME/.wasmedge/env
```
Expand All @@ -58,7 +58,7 @@ cargo run --release
Install the required WasmEdge WASM runtime (or use [`moly-runner`](#tip-use-moly-runner-for-easy-setup)):

```sh
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.0
curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install_v2.sh | bash -s -- --version=0.14.1

source $HOME/.wasmedge/env
```
Expand Down
18 changes: 9 additions & 9 deletions moly-runner/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const WASMEDGE_ROOT_DIR_NAME: &str = {
".wasmedge"
}
#[cfg(windows)] {
"WasmEdge-0.14.0-Windows"
"WasmEdge-0.14.1-Windows"
}
};

Expand Down Expand Up @@ -356,7 +356,7 @@ fn find_wasmedge_dylibs_in_dir<P: AsRef<Path>>(wasmedge_root_dir: P) -> Option<(
#[cfg(any(target_os = "linux", target_os = "macos"))]
fn install_wasmedge<P: AsRef<Path>>(install_path: P) -> Result<PathBuf, std::io::Error> {
use std::process::Stdio;
println!("Downloading WasmEdge 0.14.0 from GitHub; installing to {}", install_path.as_ref().display());
println!("Downloading WasmEdge 0.14.1 from GitHub; installing to {}", install_path.as_ref().display());
let temp_dir = std::env::temp_dir();
let curl_script_cmd = Command::new("curl")
.stdout(Stdio::piped())
Expand All @@ -371,7 +371,7 @@ fn install_wasmedge<P: AsRef<Path>>(install_path: P) -> Result<PathBuf, std::io:
.stdin(Stdio::from(curl_script_cmd.stdout.expect("failed to pipe curl stdout into bash stdin")))
.arg("-s")
.arg("--")
.arg("--version=0.14.0")
.arg("--version=0.14.1")
.arg(&format!("--path={}", install_path.as_ref().display()))
// The default `/tmp/` dir used in `install_v2.sh` isn't always accessible to bundled apps.
.arg(&format!("--tmpdir={}", temp_dir.display()));
Expand Down Expand Up @@ -423,18 +423,18 @@ fn install_wasmedge<P: AsRef<Path>>(install_path: P) -> Result<PathBuf, std::io:
#[cfg(windows)]
fn install_wasmedge<P: AsRef<Path>>(install_path_ref: P) -> Result<PathBuf, std::io::Error> {
let install_path = install_path_ref.as_ref();
println!("Downloading WasmEdge 0.14.0 from GitHub; installing to {}", install_path.display());
println!("Downloading WasmEdge 0.14.1 from GitHub; installing to {}", install_path.display());

// Currently we hardcode the URL for the v0.14.0 release of WasmEdge for windows.
const WASMEDGE_0_14_0_WINDOWS_URL: &'static str = "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.0/WasmEdge-0.14.0-windows.zip";
// Currently we hardcode the URL for the v0.14.1 release of WasmEdge for windows.
const WASMEDGE_0_14_0_WINDOWS_URL: &'static str = "https://github.com/WasmEdge/WasmEdge/releases/download/0.14.1/WasmEdge-0.14.1-windows.zip";
let (wasi_nn_plugin_url, wasi_nn_dir_name) = wasmedge_wasi_nn_plugin_url();
println!(" --> Using WASI-NN plugin at: {wasi_nn_plugin_url}");

let install_wasmedge_ps1 = format!(
r#"
$ProgressPreference = 'SilentlyContinue' ## makes downloads much faster
Invoke-WebRequest -Uri "{WASMEDGE_0_14_0_WINDOWS_URL}" -OutFile "$env:TEMP\WasmEdge-0.14.0-windows.zip"
Expand-Archive -Force -Path "$env:TEMP\WasmEdge-0.14.0-windows.zip" -DestinationPath "{}"
Invoke-WebRequest -Uri "{WASMEDGE_0_14_0_WINDOWS_URL}" -OutFile "$env:TEMP\WasmEdge-0.14.1-windows.zip"
Expand-Archive -Force -Path "$env:TEMP\WasmEdge-0.14.1-windows.zip" -DestinationPath "{}"

Invoke-WebRequest -Uri "{wasi_nn_plugin_url}" -OutFile "$env:TEMP\{wasi_nn_dir_name}.zip"
Expand-Archive -Force -Path "$env:TEMP\{wasi_nn_dir_name}.zip" -DestinationPath "$env:TEMP\{wasi_nn_dir_name}"
Expand Down Expand Up @@ -598,7 +598,7 @@ fn run_moly() -> std::io::Result<()> {


/// Checks that the current CPU supports AVX512, or either SSE4.2 or SSE4a,
/// at least one of which is required by the current builds of WasmEdge 0.14.0 on Windows.
/// at least one of which is required by the current builds of WasmEdge 0.14.1 on Windows.
///
/// This only checks x86_64 platforms, and does nothing on other platforms.
fn assert_cpu_features() {
Expand Down
8 changes: 4 additions & 4 deletions packaging/before-packaging-command/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ fn before_packaging(host_os: &str) -> std::io::Result<()> {
/// This function effectively runs the following shell commands:
/// ```sh
/// mkdir -p ./wasmedge \
/// && curl -sfL --show-error https://github.com/WasmEdge/WasmEdge/releases/download/0.14.0/WasmEdge-0.14.0-darwin_arm64.tar.gz | bsdtar -xf- -C ./wasmedge \
/// && mkdir -p ./wasmedge/WasmEdge-0.14.0-Darwin/plugin \
/// && curl -sf --location --progress-bar --show-error https://github.com/WasmEdge/WasmEdge/releases/download/0.14.0/WasmEdge-plugin-wasi_nn-ggml-0.14.0-darwin_arm64.tar.gz | bsdtar -xf- -C ./wasmedge/WasmEdge-0.14.0-Darwin/plugin; \
/// && curl -sfL --show-error https://github.com/WasmEdge/WasmEdge/releases/download/0.14.1/WasmEdge-0.14.1-darwin_arm64.tar.gz | bsdtar -xf- -C ./wasmedge \
/// && mkdir -p ./wasmedge/WasmEdge-0.14.1-Darwin/plugin \
/// && curl -sf --location --progress-bar --show-error https://github.com/WasmEdge/WasmEdge/releases/download/0.14.1/WasmEdge-plugin-wasi_nn-ggml-0.14.1-darwin_arm64.tar.gz | bsdtar -xf- -C ./wasmedge/WasmEdge-0.14.1-Darwin/plugin; \
/// ```
fn download_wasmedge_macos(version: &str) -> std::io::Result<()> {
// Command 1: Create the destination directory.
Expand Down Expand Up @@ -214,7 +214,7 @@ fn download_wasmedge_macos(version: &str) -> std::io::Result<()> {
}

// Command 3: Create the plugin destination directory.
let plugin_dest_dir = dest_dir.join("WasmEdge-0.14.0-Darwin").join("plugin");
let plugin_dest_dir = dest_dir.join("WasmEdge-0.14.1-Darwin").join("plugin");
fs::create_dir_all(&plugin_dest_dir)?;

// Command 4: Download and extract the Wasi-NN plugin.
Expand Down