From 0c5b2ba718d87ca61a8405304f8cfdf03e4b8e22 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:06:26 +0800 Subject: [PATCH 1/4] Remove lazy and GPU variants --- src/commons/__tests__/Markdown.tsx | 9 --------- src/commons/application/ApplicationTypes.ts | 5 ----- src/commons/application/__tests__/ApplicationTypes.ts | 7 ------- 3 files changed, 21 deletions(-) diff --git a/src/commons/__tests__/Markdown.tsx b/src/commons/__tests__/Markdown.tsx index a29cc39756..8393893744 100644 --- a/src/commons/__tests__/Markdown.tsx +++ b/src/commons/__tests__/Markdown.tsx @@ -22,18 +22,12 @@ test('Markdown page renders correct Source information', () => { const source1Default = ; expect(source1Default.props.content).toContain('Source \xa71'); - const source1Lazy = ; - expect(source1Lazy.props.content).toContain('Source \xa71 Lazy'); - const source1Wasm = ; expect(source1Wasm.props.content).toContain('Source \xa71 WebAssembly'); const source2Default = ; expect(source2Default.props.content).toContain('Source \xa72'); - const source2Lazy = ; - expect(source2Lazy.props.content).toContain('Source \xa72 Lazy'); - const source3Default = ; expect(source3Default.props.content).toContain('Source \xa73'); @@ -42,7 +36,4 @@ test('Markdown page renders correct Source information', () => { const source4Default = ; expect(source4Default.props.content).toContain('Source \xa74'); - - const source4GPU = ; - expect(source4GPU.props.content).toContain('Source \xa74 GPU'); }); diff --git a/src/commons/application/ApplicationTypes.ts b/src/commons/application/ApplicationTypes.ts index e7f1500967..fbc2728d20 100644 --- a/src/commons/application/ApplicationTypes.ts +++ b/src/commons/application/ApplicationTypes.ts @@ -161,8 +161,6 @@ const variantDisplay: Map = new Map([ [Variant.TYPED, 'Typed'], [Variant.WASM, 'WebAssembly'], [Variant.CONCURRENT, 'Concurrent'], - [Variant.LAZY, 'Lazy'], - [Variant.GPU, 'GPU'], [Variant.NATIVE, 'Native'], [Variant.EXPLICIT_CONTROL, 'Explicit-Control'] ]); @@ -260,12 +258,10 @@ const sourceSubLanguages: Array> = [ { chapter: Chapter.SOURCE_1, variant: Variant.DEFAULT }, { chapter: Chapter.SOURCE_1, variant: Variant.TYPED }, { chapter: Chapter.SOURCE_1, variant: Variant.WASM }, - { chapter: Chapter.SOURCE_1, variant: Variant.LAZY }, { chapter: Chapter.SOURCE_1, variant: Variant.NATIVE }, { chapter: Chapter.SOURCE_2, variant: Variant.DEFAULT }, { chapter: Chapter.SOURCE_2, variant: Variant.TYPED }, - { chapter: Chapter.SOURCE_2, variant: Variant.LAZY }, { chapter: Chapter.SOURCE_2, variant: Variant.NATIVE }, { chapter: Chapter.SOURCE_3, variant: Variant.DEFAULT }, @@ -275,7 +271,6 @@ const sourceSubLanguages: Array> = [ { chapter: Chapter.SOURCE_4, variant: Variant.DEFAULT }, { chapter: Chapter.SOURCE_4, variant: Variant.TYPED }, - { chapter: Chapter.SOURCE_4, variant: Variant.GPU }, { chapter: Chapter.SOURCE_4, variant: Variant.NATIVE }, { chapter: Chapter.SOURCE_4, variant: Variant.EXPLICIT_CONTROL } ]; diff --git a/src/commons/application/__tests__/ApplicationTypes.ts b/src/commons/application/__tests__/ApplicationTypes.ts index 077cd0f8e1..902332f588 100644 --- a/src/commons/application/__tests__/ApplicationTypes.ts +++ b/src/commons/application/__tests__/ApplicationTypes.ts @@ -27,7 +27,6 @@ describe('available Source language configurations', () => { { chapter: Chapter.SOURCE_1, variant: Variant.DEFAULT, supports: { substVisualizer: true } }, { chapter: Chapter.SOURCE_1, variant: Variant.TYPED, supports: { substVisualizer: true } }, { chapter: Chapter.SOURCE_1, variant: Variant.WASM }, - { chapter: Chapter.SOURCE_1, variant: Variant.LAZY }, { chapter: Chapter.SOURCE_1, variant: Variant.NATIVE, supports: { substVisualizer: true } }, // Source 2 { @@ -40,7 +39,6 @@ describe('available Source language configurations', () => { variant: Variant.TYPED, supports: { dataVisualizer: true, substVisualizer: true } }, - { chapter: Chapter.SOURCE_2, variant: Variant.LAZY, supports: { dataVisualizer: true } }, { chapter: Chapter.SOURCE_2, variant: Variant.NATIVE, @@ -78,11 +76,6 @@ describe('available Source language configurations', () => { variant: Variant.TYPED, supports: { dataVisualizer: true, cseMachine: true } }, - { - chapter: Chapter.SOURCE_4, - variant: Variant.GPU, - supports: { dataVisualizer: true, cseMachine: true } - }, { chapter: Chapter.SOURCE_4, variant: Variant.NATIVE, From 7d1ba2da250d1305bae74421a0442260383e2441 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:07:09 +0800 Subject: [PATCH 2/4] Fix some tests involving lazy or GPU --- src/commons/sagas/__tests__/BackendSaga.ts | 6 +++--- src/commons/sagas/__tests__/PersistenceSaga.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commons/sagas/__tests__/BackendSaga.ts b/src/commons/sagas/__tests__/BackendSaga.ts index e6ea9f1320..3111a21901 100644 --- a/src/commons/sagas/__tests__/BackendSaga.ts +++ b/src/commons/sagas/__tests__/BackendSaga.ts @@ -832,8 +832,8 @@ describe('Test CHANGE_SUBLANGUAGE action', () => { test('when chapter is changed', () => { const sublang: SALanguage = { chapter: Chapter.SOURCE_4, - variant: Variant.GPU, - displayName: 'Source \xa74 GPU', + variant: Variant.CONCURRENT, + displayName: 'Source \xa74 Concurrent', mainLanguage: SupportedLanguage.JAVASCRIPT, supports: {} }; @@ -854,7 +854,7 @@ describe('Test CHANGE_SUBLANGUAGE action', () => { [ call(putCourseConfig, mockTokens, { sourceChapter: Chapter.SOURCE_4, - sourceVariant: Variant.GPU + sourceVariant: Variant.CONCURRENT }), { ok: true } ] diff --git a/src/commons/sagas/__tests__/PersistenceSaga.ts b/src/commons/sagas/__tests__/PersistenceSaga.ts index 25460cceb0..49e9fbf47f 100644 --- a/src/commons/sagas/__tests__/PersistenceSaga.ts +++ b/src/commons/sagas/__tests__/PersistenceSaga.ts @@ -20,7 +20,7 @@ const FILE_ID = '123'; const FILE_NAME = 'file'; const FILE_DATA = '// Hello world'; const SOURCE_CHAPTER = Chapter.SOURCE_3; -const SOURCE_VARIANT = Variant.LAZY; +const SOURCE_VARIANT = Variant.DEFAULT; const SOURCE_LIBRARY = ExternalLibraryName.SOUNDS; beforeAll(() => { From 254059ae7d4eb79ce54e32688da6bf48458fd43d Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:07:30 +0800 Subject: [PATCH 3/4] Remove code no longer required --- src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts b/src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts index e87039ccfb..28217b184e 100644 --- a/src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts +++ b/src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts @@ -130,15 +130,7 @@ export function* evalCodeSaga( const entrypointCode = files[entrypointFilePath]; function call_variant(variant: Variant) { - if (variant === Variant.LAZY) { - return call(runFilesInContext, files, entrypointFilePath, context, { - scheduler: 'preemptive', - originalMaxExecTime: execTime, - stepLimit: stepLimit, - useSubst: substActiveAndCorrectChapter, - envSteps: currentStep - }); - } else if (variant === Variant.WASM) { + if (variant === Variant.WASM) { // Note: WASM does not support multiple file programs. return call( wasm_compile_and_run, @@ -256,7 +248,6 @@ export function* evalCodeSaga( }); } - const isLazy: boolean = context.variant === Variant.LAZY; const isWasm: boolean = context.variant === Variant.WASM; const isC: boolean = context.chapter === Chapter.FULL_C; const isJava: boolean = context.chapter === Chapter.FULL_JAVA; @@ -284,7 +275,7 @@ export function* evalCodeSaga( result: actionType === InterpreterActions.debuggerResume.type ? call(resume, lastDebuggerResult) - : isLazy || isWasm + : isWasm ? call_variant(context.variant) : isC ? call(cCompileAndRun, entrypointCode, context) From 690c8cad1c6955e0c00ca339b575a7978d9c0f33 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 5 Mar 2025 11:07:45 +0800 Subject: [PATCH 4/4] Update test snapshots --- .../__snapshots__/ApplicationTypes.ts.snap | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap b/src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap index 08f1675864..17a957a1a4 100644 --- a/src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap +++ b/src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap @@ -110,19 +110,6 @@ Array [ }, "variant": "wasm", }, - Object { - "chapter": 1, - "displayName": "Source §1 Lazy", - "mainLanguage": "JavaScript", - "supports": Object { - "cseMachine": false, - "dataVisualizer": false, - "multiFile": false, - "repl": true, - "substVisualizer": false, - }, - "variant": "lazy", - }, Object { "chapter": 1, "displayName": "Source §1 Native", @@ -162,19 +149,6 @@ Array [ }, "variant": "typed", }, - Object { - "chapter": 2, - "displayName": "Source §2 Lazy", - "mainLanguage": "JavaScript", - "supports": Object { - "cseMachine": false, - "dataVisualizer": true, - "multiFile": true, - "repl": true, - "substVisualizer": false, - }, - "variant": "lazy", - }, Object { "chapter": 2, "displayName": "Source §2 Native", @@ -266,19 +240,6 @@ Array [ }, "variant": "typed", }, - Object { - "chapter": 4, - "displayName": "Source §4 GPU", - "mainLanguage": "JavaScript", - "supports": Object { - "cseMachine": true, - "dataVisualizer": true, - "multiFile": true, - "repl": true, - "substVisualizer": false, - }, - "variant": "gpu", - }, Object { "chapter": 4, "displayName": "Source §4 Native",