Skip to content

Commit 06e8d28

Browse files
lloyal-researchlloyal-research
authored
Merge pull request #5 from lloyal-ai/feat/metrics
npm scope and CI config updates
2 parents 9fcd5b4 + 5941dab commit 06e8d28

8 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
arch: arm64
1919
gpu: metal
2020
package: darwin-arm64
21-
- os: macos-13
21+
- os: macos-15-intel
2222
arch: x64
2323
gpu: cpu
2424
package: darwin-x64

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Phase 1 Tests (Build from Source)
1+
name: Build & Test
22

33
on:
44
push:
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323
with:
2424
lfs: true
25-
# NO submodules - we're testing vendor/ sources (Phase 1 requirement)
25+
# NO submodules - we're testing vendor/ sources
2626

2727
- name: Pull Git LFS files
2828
run: git lfs pull
@@ -104,7 +104,7 @@ jobs:
104104
echo "Node: ${{ matrix.node }}"
105105
echo "Platform: $(node -p 'process.platform')"
106106
echo "Arch: $(node -p 'process.arch')"
107-
echo "Vendor sources used: YES (Phase 1)"
107+
echo "Built from vendored sources: YES"
108108
if [ -f vendor/VERSIONS.json ]; then
109109
echo "Vendored versions:"
110110
cat vendor/VERSIONS.json
@@ -189,12 +189,12 @@ jobs:
189189
- name: Check test results
190190
run: |
191191
echo "================================"
192-
echo "Phase 1 Test Results"
192+
echo "Test Results Summary"
193193
echo "================================"
194-
echo "✓ Vendor sources tested on Linux, macOS, Windows"
194+
echo "✓ Source builds tested on Linux, macOS, Windows"
195195
echo "✓ Node.js 22, 24 (LTS) compatibility verified"
196196
echo "✓ npm package contents verified"
197197
echo "✓ API tests passed (11 tests)"
198198
echo "✓ E2E tests passed (4 text generation + 8 embedding tests)"
199199
echo ""
200-
echo "Phase 1 (Build from Source) Status: ${{ needs.test-vendored-sources.result }}"
200+
echo "Build & Test Status: ${{ needs.test-vendored-sources.result }}"

‎docs/distribution.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ To force a specific GPU backend, install the platform package directly:
5151

5252
```bash
5353
# Force CUDA on Linux
54-
npm install @lloyal/lloyal.node-linux-x64-cuda
54+
npm install @lloyal-labs/lloyal.node-linux-x64-cuda
5555

5656
# Force Vulkan on Windows
57-
npm install @lloyal/lloyal.node-win32-x64-vulkan
57+
npm install @lloyal-labs/lloyal.node-win32-x64-vulkan
5858
```
5959

6060
Or set an environment variable before installation:
@@ -102,34 +102,34 @@ Requires NVIDIA GPU with compute capability 6.0+ and CUDA 12.6 runtime.
102102

103103
**Linux/Windows:**
104104
```bash
105-
npm install @lloyal/lloyal.node-linux-x64-cuda
105+
npm install @lloyal-labs/lloyal.node-linux-x64-cuda
106106
# or
107-
npm install @lloyal/lloyal.node-win32-x64-cuda
107+
npm install @lloyal-labs/lloyal.node-win32-x64-cuda
108108
```
109109

110110
**Jetson (ARM64):**
111111
```bash
112-
npm install @lloyal/lloyal.node-linux-arm64-cuda
112+
npm install @lloyal-labs/lloyal.node-linux-arm64-cuda
113113
```
114114

115115
### Vulkan (Cross-Platform)
116116

117117
Works with AMD, Intel, NVIDIA, and Qualcomm GPUs. Requires Vulkan 1.3+ drivers.
118118

119119
```bash
120-
npm install @lloyal/lloyal.node-linux-x64-vulkan
120+
npm install @lloyal-labs/lloyal.node-linux-x64-vulkan
121121
# or
122-
npm install @lloyal/lloyal.node-win32-x64-vulkan
122+
npm install @lloyal-labs/lloyal.node-win32-x64-vulkan
123123
```
124124

125125
### CPU-Only
126126

127127
No GPU acceleration. Works on all platforms.
128128

129129
```bash
130-
npm install @lloyal/lloyal.node-darwin-x64 # macOS Intel
131-
npm install @lloyal/lloyal.node-linux-x64 # Linux x64
132-
npm install @lloyal/lloyal.node-win32-x64 # Windows x64
130+
npm install @lloyal-labs/lloyal.node-darwin-x64 # macOS Intel
131+
npm install @lloyal-labs/lloyal.node-linux-x64 # Linux x64
132+
npm install @lloyal-labs/lloyal.node-win32-x64 # Windows x64
133133
```
134134

135135
---
@@ -144,8 +144,8 @@ npm install @lloyal/lloyal.node-win32-x64 # Windows x64
144144
{
145145
"name": "lloyal.node",
146146
"optionalDependencies": {
147-
"@lloyal/lloyal.node-darwin-arm64": "1.0.0",
148-
"@lloyal/lloyal.node-linux-x64-cuda": "1.0.0",
147+
"@lloyal-labs/lloyal.node-darwin-arm64": "1.0.0",
148+
"@lloyal-labs/lloyal.node-linux-x64-cuda": "1.0.0",
149149
...
150150
}
151151
}
@@ -160,12 +160,12 @@ Each platform package contains:
160160
- Platform-specific shared libraries (`*.dylib`, `*.so`, `*.dll`)
161161
- Minimal dependencies (no build tools required)
162162

163-
**Package naming:** `@lloyal/lloyal.node-{platform}-{arch}[-{gpu}]`
163+
**Package naming:** `@lloyal-labs/lloyal.node-{platform}-{arch}[-{gpu}]`
164164

165165
Examples:
166-
- `@lloyal/lloyal.node-darwin-arm64` (macOS Apple Silicon with Metal)
167-
- `@lloyal/lloyal.node-linux-x64-cuda` (Linux x64 with CUDA 12.6)
168-
- `@lloyal/lloyal.node-win32-arm64-vulkan` (Windows ARM64 with Vulkan)
166+
- `@lloyal-labs/lloyal.node-darwin-arm64` (macOS Apple Silicon with Metal)
167+
- `@lloyal-labs/lloyal.node-linux-x64-cuda` (Linux x64 with CUDA 12.6)
168+
- `@lloyal-labs/lloyal.node-win32-arm64-vulkan` (Windows ARM64 with Vulkan)
169169

170170
---
171171

@@ -277,14 +277,14 @@ git push origin v1.0.0
277277

278278
GitHub Actions automatically:
279279
- Builds all 13 platform packages
280-
- Publishes to npm registry (`@lloyal/lloyal.node-*`)
280+
- Publishes to npm registry (`@lloyal-labs/lloyal.node-*`)
281281
- Publishes main package (`lloyal.node`)
282282

283283
**4. Verify release:**
284284

285285
```bash
286286
npm info lloyal.node
287-
npm info @lloyal/lloyal.node-linux-x64-cuda
287+
npm info @lloyal-labs/lloyal.node-linux-x64-cuda
288288
```
289289

290290
### Version Management

‎package-lock.json‎

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
"node-gyp": "^10.2.0"
4848
},
4949
"optionalDependencies": {
50-
"@lloyal/lloyal.node-darwin-arm64": "0.1.0",
51-
"@lloyal/lloyal.node-darwin-x64": "0.1.0",
52-
"@lloyal/lloyal.node-linux-x64": "0.1.0",
53-
"@lloyal/lloyal.node-linux-x64-cuda": "0.1.0",
54-
"@lloyal/lloyal.node-linux-x64-vulkan": "0.1.0",
55-
"@lloyal/lloyal.node-linux-arm64": "0.1.0",
56-
"@lloyal/lloyal.node-linux-arm64-cuda": "0.1.0",
57-
"@lloyal/lloyal.node-linux-arm64-vulkan": "0.1.0",
58-
"@lloyal/lloyal.node-win32-x64": "0.1.0",
59-
"@lloyal/lloyal.node-win32-x64-cuda": "0.1.0",
60-
"@lloyal/lloyal.node-win32-x64-vulkan": "0.1.0",
61-
"@lloyal/lloyal.node-win32-arm64": "0.1.0",
62-
"@lloyal/lloyal.node-win32-arm64-vulkan": "0.1.0"
50+
"@lloyal-labs/lloyal.node-darwin-arm64": "0.1.0",
51+
"@lloyal-labs/lloyal.node-darwin-x64": "0.1.0",
52+
"@lloyal-labs/lloyal.node-linux-x64": "0.1.0",
53+
"@lloyal-labs/lloyal.node-linux-x64-cuda": "0.1.0",
54+
"@lloyal-labs/lloyal.node-linux-x64-vulkan": "0.1.0",
55+
"@lloyal-labs/lloyal.node-linux-arm64": "0.1.0",
56+
"@lloyal-labs/lloyal.node-linux-arm64-cuda": "0.1.0",
57+
"@lloyal-labs/lloyal.node-linux-arm64-vulkan": "0.1.0",
58+
"@lloyal-labs/lloyal.node-win32-x64": "0.1.0",
59+
"@lloyal-labs/lloyal.node-win32-x64-cuda": "0.1.0",
60+
"@lloyal-labs/lloyal.node-win32-x64-vulkan": "0.1.0",
61+
"@lloyal-labs/lloyal.node-win32-arm64": "0.1.0",
62+
"@lloyal-labs/lloyal.node-win32-arm64-vulkan": "0.1.0"
6363
},
6464
"engines": {
6565
"node": ">=22.0.0"

‎packages/template/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@lloyal/lloyal.node-PLATFORM",
2+
"name": "@lloyal-labs/lloyal.node-PLATFORM",
33
"version": "0.0.0",
44
"description": "Lloyal native binary for PLATFORM",
55
"main": "index.js",
@@ -18,5 +18,5 @@
1818
"url": "git+https://github.com/lloyal-ai/lloyal.node.git"
1919
},
2020
"author": "lloyal.ai",
21-
"license": "MIT"
21+
"license": "Apache-2.0"
2222
}

‎scripts/create-platform-package.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const OS_MAP = {
3333

3434
const osName = OS_MAP[osRunner] || process.platform;
3535

36-
console.log(`\n=== Creating platform package: @lloyal/lloyal.node-${packageName} ===\n`);
36+
console.log(`\n=== Creating platform package: @lloyal-labs/lloyal.node-${packageName} ===\n`);
3737

3838
// Create directories
3939
fs.mkdirSync(BIN_DIR, { recursive: true });
@@ -101,7 +101,7 @@ if (fs.existsSync(templatePath)) {
101101
} else {
102102
// Fallback template if file doesn't exist yet
103103
pkgJson = {
104-
name: '@lloyal/lloyal.node-PLATFORM',
104+
name: '@lloyal-labs/lloyal.node-PLATFORM',
105105
version: '0.0.0',
106106
description: 'Lloyal native binary for PLATFORM',
107107
main: 'index.js',
@@ -110,12 +110,12 @@ if (fs.existsSync(templatePath)) {
110110
type: 'git',
111111
url: 'git+https://github.com/lloyal-ai/lloyal.node.git'
112112
},
113-
license: 'MIT'
113+
license: 'Apache-2.0'
114114
};
115115
}
116116

117117
// Update with actual values
118-
pkgJson.name = `@lloyal/lloyal.node-${packageName}`;
118+
pkgJson.name = `@lloyal-labs/lloyal.node-${packageName}`;
119119
pkgJson.version = mainPackageJson.version;
120120
pkgJson.description = `Lloyal native binary for ${packageName}`;
121121
pkgJson.os = [osName];
@@ -142,7 +142,7 @@ console.log(` ✓ Created index.js`);
142142

143143
// Summary
144144
console.log(`\n✅ Platform package created successfully!`);
145-
console.log(`\nPackage: @lloyal/lloyal.node-${packageName}@${pkgJson.version}`);
145+
console.log(`\nPackage: @lloyal-labs/lloyal.node-${packageName}@${pkgJson.version}`);
146146
console.log(`Location: ${PKG_DIR}`);
147147
console.log(`\nContents:`);
148148
fs.readdirSync(BIN_DIR).forEach(f => {

‎scripts/install.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function main() {
115115
// 1. Check for user-specified GPU variant via environment variable
116116
if (process.env.LLOYAL_GPU) {
117117
const gpu = process.env.LLOYAL_GPU.toLowerCase();
118-
const packageName = `@lloyal/lloyal.node-${PLATFORM}-${ARCH}-${gpu}`;
118+
const packageName = `@lloyal-labs/lloyal.node-${PLATFORM}-${ARCH}-${gpu}`;
119119

120120
log(`LLOYAL_GPU=${gpu}, looking for ${packageName}...`);
121121
const binDir = findPrebuilt(packageName);
@@ -131,7 +131,7 @@ function main() {
131131
// 2. Check for GPU variants in priority order
132132
const gpuVariants = ['cuda', 'vulkan'];
133133
for (const gpu of gpuVariants) {
134-
const packageName = `@lloyal/lloyal.node-${PLATFORM}-${ARCH}-${gpu}`;
134+
const packageName = `@lloyal-labs/lloyal.node-${PLATFORM}-${ARCH}-${gpu}`;
135135
const binDir = findPrebuilt(packageName);
136136

137137
if (binDir) {
@@ -142,7 +142,7 @@ function main() {
142142
}
143143

144144
// 3. Check for default platform package (CPU or Metal on macOS)
145-
const defaultPackage = `@lloyal/lloyal.node-${PLATFORM}-${ARCH}`;
145+
const defaultPackage = `@lloyal-labs/lloyal.node-${PLATFORM}-${ARCH}`;
146146
const binDir = findPrebuilt(defaultPackage);
147147

148148
if (binDir) {

0 commit comments

Comments
 (0)