From c14c41efd90fcc12355680e08fc4c066311adae0 Mon Sep 17 00:00:00 2001 From: Philipp Schaad Date: Mon, 30 Sep 2024 13:09:19 +0200 Subject: [PATCH] Fix circular dep --- src/index.ts | 1 - src/overlays/generic_sdfg_overlay.ts | 3 +-- src/renderer/renderer.ts | 2 +- src/sdfv.ts | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 734e678..fbf84cd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import { SDFGElement } from './renderer/renderer_elements'; -export * from './overlays/generic_sdfg_overlay'; export * from './overlays/memory_volume_overlay'; export * from './overlays/runtime_micro_seconds_overlay'; export * from './overlays/memory_location_overlay'; diff --git a/src/overlays/generic_sdfg_overlay.ts b/src/overlays/generic_sdfg_overlay.ts index 91bca13..9b50901 100644 --- a/src/overlays/generic_sdfg_overlay.ts +++ b/src/overlays/generic_sdfg_overlay.ts @@ -1,8 +1,7 @@ // Copyright 2019-2024 ETH Zurich and the DaCe authors. All rights reserved. import { log, mean, median } from 'mathjs'; -import { DagreGraph, Point2D, SDFVSettings, SimpleRect } from '../index'; -import { OverlayManager, SymbolResolver } from '../overlay_manager'; +import { DagreGraph, OverlayManager, Point2D, SDFVSettings, SimpleRect, SymbolResolver } from '../index'; import { GraphElementInfo, SDFGElementGroup, diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts index da916a0..2f8d4b4 100644 --- a/src/renderer/renderer.ts +++ b/src/renderer/renderer.ts @@ -6,7 +6,6 @@ import dagre from 'dagre'; import EventEmitter from 'events'; import { DagreGraph, - GenericSdfgOverlay, JsonSDFG, JsonSDFGBlock, JsonSDFGConditionalBlock, @@ -61,6 +60,7 @@ import { } from './renderer_elements'; import { cfgToDotGraph } from '../utils/sdfg/dotgraph'; import { layoutSDFG } from '../layouter/layout'; +import { GenericSdfgOverlay } from '../overlays/generic_sdfg_overlay'; // External, non-typescript libraries which are presented as previously loaded // scripts and global javascript variables: diff --git a/src/sdfv.ts b/src/sdfv.ts index 7186490..b98f76d 100644 --- a/src/sdfv.ts +++ b/src/sdfv.ts @@ -10,7 +10,6 @@ import { EventEmitter } from 'events'; import { mean, median } from 'mathjs'; import { DagreGraph, - GenericSdfgOverlay, JsonSDFG, ModeButtons, showErrorModal, @@ -38,6 +37,7 @@ import { import { SDFVSettings } from './utils/sdfv_settings'; import { DiffMap, WebSDFGDiffViewer } from './sdfg_diff_viewer'; import { ISDFVUserInterface, SDFVWebUI } from './sdfv_ui'; +import { GenericSdfgOverlay } from './overlays/generic_sdfg_overlay'; declare const vscode: any;