Move ArtifactCache to Interface to support future different cache typ…

…es, fix README path typo, Support delete and batch delete

web/README.md

@@ -94,4 +94,4 @@ Right now we use the SPIRV to generate shaders that can be accepted by Chrome an
   - Firefox should be close pending the support of Fence.
 - Download vulkan SDK (1.1 or higher) that supports SPIRV 1.3
 - Start the WebSocket RPC
-- run `python tests/node/webgpu_rpc_test.py`
+- run `python tests/python/webgpu_rpc_test.py`

web/src/artifact_cache.ts

@@ -0,0 +1,19 @@
+/*
+    Common Interface for the artifact cache
+*/
+export interface ArtifactCacheTemplate {
+    /**
+     * fetch key url from cache
+     */
+    fetchWithCache(url: string);
+
+    /**
+     * check if cache has all keys in Cache
+     */
+    hasAllKeys(keys: string[]);
+
+    /**
+     * Delete url in cache if url exists
+     */
+    deleteInCache(url: string);
+}

web/src/runtime.ts

@@ -26,6 +26,7 @@ import { Memory, CachedCallStack } from "./memory";
 import { assert, StringToUint8Array } from "./support";
 import { Environment } from "./environment";
 import { FunctionInfo, WebGPUContext } from "./webgpu";
+import { ArtifactCacheTemplate } from "./artifact_cache";
 
 import * as compact from "./compact";
 import * as ctypes from "./ctypes";
@@ -985,7 +986,7 @@ export type InitProgressCallback = (report: InitProgressReport) => void;
 /**
  * Cache to store model related data.
  */
-export class ArtifactCache {
+export class ArtifactCache implements ArtifactCacheTemplate {
   private scope: string;
   private cache?: Cache;
 
@@ -1018,6 +1019,17 @@ export class ArtifactCache {
       .then(cacheKeys => keys.every(key => cacheKeys.indexOf(key) !== -1))
       .catch(err => false);
   }
+
+  async deleteInCache(url: string) {
+    if (this.cache === undefined) {
+      this.cache = await caches.open(this.scope);
+    }
+    const result = await this.cache.delete(url);
+    if (result === undefined){
+      throw Error("Cannot delete " + url);
+    }
+    return result;
+  }
 }
 
 /**
@@ -1477,6 +1489,41 @@ export class Instance implements Disposable {
     this.cacheMetadata = { ...this.cacheMetadata, ...(list["metadata"] as Record<string, any>) };
   }
 
+  /**
+   * Delete NDArray from cache url.
+   *
+   * @param ndarrayCacheUrl
+   * @param device
+   * @param cacheScope
+   */
+  async deleteNDArrayCache(
+    ndarrayCacheUrl: string,
+    device: DLDevice,
+    cacheScope = "tvmjs"
+  ): Promise<any>{
+    const artifactCache = new ArtifactCache(cacheScope);
+    const jsonUrl = new URL("ndarray-cache.json", ndarrayCacheUrl).href;
+    const result = await artifactCache.fetchWithCache(jsonUrl);
+    let list;
+    if (result instanceof Response){
+      list = await result.json();
+    }
+    const arrayentry = list["records"] as Array<NDArrayShardEntry>;
+    for (let i = 0; i < arrayentry.length; ++i){
+      const dataUrl = new URL(arrayentry[i].dataPath, ndarrayCacheUrl).href;
+      try {
+        const result = await(await artifactCache.deleteInCache(dataUrl));
+        if (result === false){
+          return false;
+        }
+      } catch (err){
+        this.env.logger("Error: Cannot fetch " + dataUrl + " err= " + err);
+        throw err;
+      }
+    }
+    return true;
+  }
+
   /**
    * Fetch list of NDArray into the NDArrayCache.
    *
@@ -1489,7 +1536,7 @@ export class Instance implements Disposable {
     ndarrayCacheUrl: string,
     list: Array<NDArrayShardEntry>,
     device: DLDevice,
-    artifactCache: ArtifactCache
+    artifactCache: ArtifactCacheTemplate
   ) {
     const perf = compact.getPerformance();
     const tstart = perf.now();