Use @sourceacademy/torch instead of torch

Author: veehz

package.json

@@ -60,13 +60,13 @@
   },
   "dependencies": {
     "@sourceacademy/conductor": "^0.3.0",
+    "@sourceacademy/torch": "^0.1.0",
     "@sourceacademy/wasm-util": "^1.0.6",
     "fast-levenshtein": "^3.0.0",
     "mathjs": "^14.9.1",
     "moo": "^0.5.2",
     "nearley": "^2.20.1",
     "pyodide": "^0.29.3",
-    "torch": "https://pkg.pr.new/veehz/torch@687fc81",
     "wabt": "^1.0.37"
   }
 }

src/conductor/index.ts

@@ -1,18 +1,16 @@
+export {
+  PyodideEvaluator1,
+  PyodideEvaluator2,
+  PyodideEvaluator3,
+  PyodideEvaluator4,
+  PyodideEvaluatorFull,
+} from "../pyodide/PyodideEvaluator";
 export {
   PyCseEvaluator1,
   PyCseEvaluator2,
   PyCseEvaluator3,
   PyCseEvaluator4,
 } from "./PyCseEvaluator";
 export { PySvmlEvaluator } from "./PySvmlEvaluator";
-export { PyWasmEvaluator } from "./PyWasmEvaluator";
 export { PySvmlSinterEvaluator } from "./PySvmlSinterEvaluator";
-export {
-  PyodideEvaluator1,
-  PyodideEvaluator2,
-  PyodideEvaluator3,
-  PyodideEvaluator4,
-  PyodideEvaluatorFull,
-} from "../pyodide/PyodideEvaluator";
-
-
+export { PyWasmEvaluator } from "./PyWasmEvaluator";

src/pyodide/loadTorch.ts

@@ -1,5 +1,5 @@
 import type { PyodideInterface } from "pyodide";
-import * as torch from "torch";
+import * as torch from "@sourceacademy/torch";
 import bridgeCode from "./bridge.py";
 
 /**

src/tests/pyodide-torch.test.ts

@@ -8,7 +8,7 @@
 
 import { loadPyodide } from "pyodide";
 import type { PyodideInterface } from "pyodide";
-import * as torch from "torch";
+import * as torch from "@sourceacademy/torch";
 import bridgeCode from "../pyodide/bridge.py";
 import { rewriteTorchImports, resetHelperState } from "../pyodide/importAnalyzer";
 

yarn.lock

@@ -1643,6 +1643,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sourceacademy/torch@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@sourceacademy/torch@npm:0.1.0"
+  checksum: 10c0/bc6408d374a23080d3581ac06edbfd02f94215a9d2c27c38913a7b2ef99d5eadcec5f8b496dba4fac44341a216bded3412622f5b66152253373d969cdbbf7431
+  languageName: node
+  linkType: hard
+
 "@sourceacademy/wasm-util@npm:^1.0.6":
   version: 1.0.6
   resolution: "@sourceacademy/wasm-util@npm:1.0.6"
@@ -4775,6 +4782,7 @@ __metadata:
     "@rollup/plugin-typescript": "npm:^12.1.2"
     "@rollup/plugin-wasm": "npm:^6.2.2"
     "@sourceacademy/conductor": "npm:^0.3.0"
+    "@sourceacademy/torch": "npm:^0.1.0"
     "@sourceacademy/wasm-util": "npm:^1.0.6"
     "@types/fast-levenshtein": "npm:^0.0.4"
     "@types/jest": "npm:^29.5.14"
@@ -4794,7 +4802,6 @@ __metadata:
     pyodide: "npm:^0.29.3"
     rollup: "npm:^4.59.0"
     rollup-plugin-polyfill-node: "npm:^0.13.0"
-    torch: "https://pkg.pr.new/veehz/torch@687fc81"
     ts-jest: "npm:^29.0.5"
     tslib: "npm:^2.8.1"
     tsx: "npm:^4.19.0"
@@ -5342,13 +5349,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"torch@https://pkg.pr.new/veehz/torch@687fc81":
-  version: 0.1.0
-  resolution: "torch@https://pkg.pr.new/veehz/torch@687fc81"
-  checksum: 10c0/84fd0d0fae8f5e67dccfa01d429755ef5db147340544f697a14ce32332a31b5515b84aa47ac849c327f1026c8c4ff29a7af3c60bd5c1db541f49ddfa9f529185
-  languageName: node
-  linkType: hard
-
 "ts-api-utils@npm:^2.4.0":
   version: 2.5.0
   resolution: "ts-api-utils@npm:2.5.0"