From 93c794dba4f781939ff882165269dcd24862ba69 Mon Sep 17 00:00:00 2001 From: Krzysztof Magiera Date: Wed, 4 Sep 2024 16:40:49 +0200 Subject: [PATCH 1/3] Fix relative paths for codegen after monorepo setup --- packages/webgpu/scripts/codegen/codegen.ts | 2 +- packages/webgpu/scripts/codegen/model/dawn.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/webgpu/scripts/codegen/codegen.ts b/packages/webgpu/scripts/codegen/codegen.ts index 73196f779..b04d6b503 100644 --- a/packages/webgpu/scripts/codegen/codegen.ts +++ b/packages/webgpu/scripts/codegen/codegen.ts @@ -14,7 +14,7 @@ import { getDescriptor } from "./Descriptors"; const tsConfigFilePath = path.resolve(__dirname, "../../tsconfig.json"); const filePath = path.resolve( __dirname, - "../../node_modules/@webgpu/types/dist/index.d.ts", + "../../../../node_modules/@webgpu/types/dist/index.d.ts", ); const project = new Project({ tsConfigFilePath, diff --git a/packages/webgpu/scripts/codegen/model/dawn.ts b/packages/webgpu/scripts/codegen/model/dawn.ts index fb74c6479..5c0da1f99 100644 --- a/packages/webgpu/scripts/codegen/model/dawn.ts +++ b/packages/webgpu/scripts/codegen/model/dawn.ts @@ -1,6 +1,6 @@ import _ from "lodash"; -import dawn from "../../../libs/dawn.json"; +import dawn from "../../../../../externals/dawn/src/dawn/dawn.json"; export const mapKeys = (obj: T) => Object.keys(obj) as (keyof T)[]; From 283be68fed414ccafe55af4565283a3d3dc8ee17 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Thu, 5 Sep 2024 12:12:25 +0200 Subject: [PATCH 2/3] :green_heart: --- .github/workflows/ci.yml | 31 +++++++++++-------- .../android/cpp/AndroidPlatformContext.h | 3 +- packages/webgpu/cpp/rnwgpu/api/GPUBuffer.h | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81628f376..b9f1b8b7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,19 +32,24 @@ jobs: - name: Typecheck files run: yarn tsc - # test: - # runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - - # - name: Setup - # uses: ./.github/actions/setup - # with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - - # - name: Run unit tests - # run: yarn test --maxWorkers=2 --coverage + test: + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup + uses: ./.github/actions/setup + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Codegen + working-directory: packages/webgpu + run: yarn codegen + + - name: Run unit tests + working-directory: packages/webgpu + run: yarn test:ref build-library: runs-on: ubuntu-latest diff --git a/packages/webgpu/android/cpp/AndroidPlatformContext.h b/packages/webgpu/android/cpp/AndroidPlatformContext.h index 53e96d69c..12a959f2f 100644 --- a/packages/webgpu/android/cpp/AndroidPlatformContext.h +++ b/packages/webgpu/android/cpp/AndroidPlatformContext.h @@ -22,7 +22,8 @@ class AndroidPlatformContext : public PlatformContext { jobject _blobModule; public: - explicit AndroidPlatformContext(jobject blobModule) : _blobModule(blobModule) {} + explicit AndroidPlatformContext(jobject blobModule) + : _blobModule(blobModule) {} ~AndroidPlatformContext() { if (_blobModule) { JNIEnv *env = facebook::jni::Environment::current(); diff --git a/packages/webgpu/cpp/rnwgpu/api/GPUBuffer.h b/packages/webgpu/cpp/rnwgpu/api/GPUBuffer.h index b81f3f994..7b54a9973 100644 --- a/packages/webgpu/cpp/rnwgpu/api/GPUBuffer.h +++ b/packages/webgpu/cpp/rnwgpu/api/GPUBuffer.h @@ -77,4 +77,4 @@ class GPUBuffer : public m::HybridObject { std::vector mappings; }; -} // namespace rnwgpu +} // namespace rnwgpu \ No newline at end of file From 5afb476230c63bff192586b7fcfe325ddd153fc5 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Thu, 5 Sep 2024 12:26:12 +0200 Subject: [PATCH 3/3] :green_heart: --- packages/webgpu/scripts/codegen/model/dawn.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webgpu/scripts/codegen/model/dawn.ts b/packages/webgpu/scripts/codegen/model/dawn.ts index 5c0da1f99..fb74c6479 100644 --- a/packages/webgpu/scripts/codegen/model/dawn.ts +++ b/packages/webgpu/scripts/codegen/model/dawn.ts @@ -1,6 +1,6 @@ import _ from "lodash"; -import dawn from "../../../../../externals/dawn/src/dawn/dawn.json"; +import dawn from "../../../libs/dawn.json"; export const mapKeys = (obj: T) => Object.keys(obj) as (keyof T)[];