Skip to content

Commit

Permalink
Merge pull request #1740 from fermyon/no-all-features
Browse files Browse the repository at this point in the history
Turn back on llm gpu features
  • Loading branch information
rylev authored Sep 6, 2023
2 parents 200d2ae + eb6e873 commit 317d784
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: Cargo Clippy
run:
BUILD_SPIN_EXAMPLES=0 cargo clippy --workspace --all-targets --all-features -- -D warnings
BUILD_SPIN_EXAMPLES=0 cargo clippy --workspace --all-targets --features all-tests -- -D warnings

## This is separated out to remove e2e-tests dependency on windows/mac builds
build-rust-ubuntu:
Expand All @@ -59,7 +59,7 @@ jobs:
rust-cache: true

- name: Cargo Build
run: cargo build --workspace --release --all-targets --all-features --features openssl/vendored
run: cargo build --workspace --release --all-targets --features openssl/vendored --features all-tests
env:
CARGO_INCREMENTAL: 0

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
rust-cache: true

- name: Cargo Build
run: cargo build --workspace --release --all-targets --all-features
run: cargo build --workspace --release --all-targets
env:
CARGO_INCREMENTAL: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
rust-cache: true

- name: Cargo Build
run: cargo build --workspace --all-targets --all-features --features openssl/vendored
run: cargo build --workspace --all-targets --features all-tests --features openssl/vendored

- name: "Archive executable artifact"
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- name: build release
shell: bash
run: cargo build --all-features --release ${{ matrix.config.extraArgs }}
run: cargo build --release ${{ matrix.config.extraArgs }}

- name: Sign the binary with GitHub OIDC token
shell: bash
Expand Down
9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,12 @@ vergen = { version = "^8.2.1", default-features = false, features = [

[features]
default = []
all-tests = ["e2e-tests", "outbound-redis-tests", "config-provider-tests"]
config-provider-tests = []
e2e-tests = []
outbound-redis-tests = []
config-provider-tests = []
outbound-pg-tests = []
outbound-mysql-tests = []
# llm-metal = ["spin-trigger-http/llm-metal"]
# llm-cublas = ["spin-trigger-http/llm-cublas"]
llm-metal = ["spin-trigger-http/llm-metal"]
llm-cublas = ["spin-trigger-http/llm-cublas"]

[workspace]
members = ["crates/*", "sdk/rust", "sdk/rust/macro"]
Expand Down
5 changes: 2 additions & 3 deletions crates/llm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ uuid = { version = "1.4.1", features = ["v4"] }

[features]
default = []
# Currently disabling this because CI is failing when this feature is enabled.
# metal = ["llm/metal"]
# cublas = ["llm/cublas"]
metal = ["llm/metal"]
cublas = ["llm/cublas"]
4 changes: 2 additions & 2 deletions crates/trigger-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ harness = false

[features]
default = []
# llm-metal = ["spin-trigger/llm-metal"]
# llm-cublas = ["spin-trigger/llm-cublas"]
llm-metal = ["spin-trigger/llm-metal"]
llm-cublas = ["spin-trigger/llm-cublas"]
4 changes: 2 additions & 2 deletions crates/trigger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ tokio = { version = "1.23", features = ["rt", "macros"] }

[features]
default = []
# llm-metal = ["spin-llm/metal"]
# llm-cublas = ["spin-llm/cublas"]
llm-metal = ["spin-llm/metal"]
llm-cublas = ["spin-llm/cublas"]

0 comments on commit 317d784

Please sign in to comment.