minimize-modules: graphir module removed

ergoplatform · Aug 21, 2023 · 83c38cd · 83c38cd
1 parent 913baec
commit 83c38cd
Show file tree

Hide file tree

Showing 63 changed files with 4 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Runs tests and collect coverage
-        run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} commonJS/test corelibJS/test interpreterJS/test graphirJS/test sdkJS/test scJS/test
+        run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} commonJS/test interpreterJS/test parsersJS/test sdkJS/test scJS/test
 
       - name: Publish a JVM snapshot ${{ github.ref }}
         if: env.HAS_SECRETS == 'true'

diff --git a/build.sbt b/build.sbt
@@ -213,48 +213,6 @@ lazy val common = crossProject(JVMPlatform, JSPlatform)
 lazy val commonJS = common.js
     .enablePlugins(ScalaJSBundlerPlugin)
 
-//lazy val corelib = crossProject(JVMPlatform, JSPlatform)
-//  .in(file("core-lib"))
-//  .dependsOn(common % allConfigDependency)
-//  .settings(commonSettings ++ testSettings2,
-//    commonDependenies2,
-//    testingDependencies2,
-//    crossScalaSettings,
-//    scryptoDependency,
-//    publish / skip := true
-//  )
-//  .jvmSettings(
-//    crossScalaSettings
-//  )
-//  .jsSettings(
-//    crossScalaSettingsJS,
-//    libraryDependencies ++= Seq(
-//      "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0"
-//    ),
-//    useYarn := true
-//  )
-//lazy val corelibJS = corelib.js
-//    .enablePlugins(ScalaJSBundlerPlugin)
-
-lazy val graphir = crossProject(JVMPlatform, JSPlatform)
-  .in(file("graph-ir"))
-  .dependsOn(common % allConfigDependency)
-  .settings(
-    commonDependenies2,
-    scryptoDependency,
-    publish / skip := true
-  )
-  .jvmSettings(
-    crossScalaSettings,
-    libraryDependencies ++= Seq(scalameter)
-  )
-  .jsSettings(
-    crossScalaSettingsJS,
-    useYarn := true
-  )
-lazy val graphirJS = graphir.js
-    .enablePlugins(ScalaJSBundlerPlugin)
-
 lazy val interpreter = crossProject(JVMPlatform, JSPlatform)
   .in(file("interpreter"))
   .dependsOn(common % allConfigDependency)
@@ -352,7 +310,6 @@ lazy val sdkJS = sdk.js
 lazy val sc = crossProject(JVMPlatform, JSPlatform)
     .in(file("sc"))
     .dependsOn(
-      graphir % allConfigDependency,
       interpreter % allConfigDependency,
       parsers % allConfigDependency,
       sdk % allConfigDependency
@@ -362,6 +319,7 @@ lazy val sc = crossProject(JVMPlatform, JSPlatform)
       commonDependenies2,
       testingDependencies2,
       scorexUtilDependency, fastparseDependency, circeDependency,
+      scryptoDependency,
       Test / parallelExecution := false
     )
     .settings(publish / skip := true)
@@ -397,13 +355,13 @@ lazy val scJS = sc.js
 
 
 lazy val sigma = (project in file("."))
-  .aggregate(common.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm)
+  .aggregate(common.jvm, interpreter.jvm, parsers.jvm, sdk.jvm, sc.jvm)
   .settings(libraryDefSettings, rootSettings)
   .settings(publish / aggregate := false)
   .settings(publishLocal / aggregate := false)
 
 lazy val aggregateCompile = ScopeFilter(
-  inProjects(common.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm),
+  inProjects(common.jvm, interpreter.jvm, parsers.jvm, sdk.jvm, sc.jvm),
   inConfigurations(Compile))
 
 lazy val rootSettings = Seq(

diff --git a/...r/js/src/test/scala/scalan/Platform.scala → sc/js/src/test/scala/scalan/Platform.scala b/...r/js/src/test/scala/scalan/Platform.scala → sc/js/src/test/scala/scalan/Platform.scala
diff --git a/.../jvm/src/test/scala/scalan/Platform.scala → sc/jvm/src/test/scala/scalan/Platform.scala b/.../jvm/src/test/scala/scalan/Platform.scala → sc/jvm/src/test/scala/scalan/Platform.scala
diff --git a/...a/scalan/compilation/GraphVizExport.scala → ...a/scalan/compilation/GraphVizExport.scala b/...a/scalan/compilation/GraphVizExport.scala → ...a/scalan/compilation/GraphVizExport.scala
diff --git a/...special/collections/BasicBenchmarks.scala → ...special/collections/BasicBenchmarks.scala b/...special/collections/BasicBenchmarks.scala → ...special/collections/BasicBenchmarks.scala
diff --git a/...a/special/collections/BenchmarkGens.scala → ...a/special/collections/BenchmarkGens.scala b/...a/special/collections/BenchmarkGens.scala → ...a/special/collections/BenchmarkGens.scala
diff --git a/...special/collections/BufferBenchmark.scala → ...special/collections/BufferBenchmark.scala b/...special/collections/BufferBenchmark.scala → ...special/collections/BufferBenchmark.scala
diff --git a/...a/special/collections/CollBenchmark.scala → ...a/special/collections/CollBenchmark.scala b/...a/special/collections/CollBenchmark.scala → ...a/special/collections/CollBenchmark.scala
diff --git a/...la/special/collections/MapBenchmark.scala → ...la/special/collections/MapBenchmark.scala b/...la/special/collections/MapBenchmark.scala → ...la/special/collections/MapBenchmark.scala
diff --git a/...la/special/collections/SymBenchmark.scala → ...la/special/collections/SymBenchmark.scala b/...la/special/collections/SymBenchmark.scala → ...la/special/collections/SymBenchmark.scala
diff --git a/.../shared/src/main/resources/reference.conf → sc/shared/src/main/resources/reference.conf b/.../shared/src/main/resources/reference.conf → sc/shared/src/main/resources/reference.conf
diff --git a/...r/shared/src/main/scala/scalan/Base.scala → sc/shared/src/main/scala/scalan/Base.scala b/...r/shared/src/main/scala/scalan/Base.scala → sc/shared/src/main/scala/scalan/Base.scala
diff --git a/.../src/main/scala/scalan/DefRewriting.scala → .../src/main/scala/scalan/DefRewriting.scala b/.../src/main/scala/scalan/DefRewriting.scala → .../src/main/scala/scalan/DefRewriting.scala
diff --git a/...ared/src/main/scala/scalan/Entities.scala → ...ared/src/main/scala/scalan/Entities.scala b/...ared/src/main/scala/scalan/Entities.scala → ...ared/src/main/scala/scalan/Entities.scala
diff --git a/...ed/src/main/scala/scalan/Exceptions.scala → ...ed/src/main/scala/scalan/Exceptions.scala b/...ed/src/main/scala/scalan/Exceptions.scala → ...ed/src/main/scala/scalan/Exceptions.scala
diff --git a/...main/scala/scalan/GraphIRReflection.scala → ...main/scala/scalan/GraphIRReflection.scala b/...main/scala/scalan/GraphIRReflection.scala → ...main/scala/scalan/GraphIRReflection.scala
diff --git a/...hared/src/main/scala/scalan/Library.scala → ...hared/src/main/scala/scalan/Library.scala b/...hared/src/main/scala/scalan/Library.scala → ...hared/src/main/scala/scalan/Library.scala
diff --git a/...d/src/main/scala/scalan/MethodCalls.scala → ...d/src/main/scala/scalan/MethodCalls.scala b/...d/src/main/scala/scalan/MethodCalls.scala → ...d/src/main/scala/scalan/MethodCalls.scala
diff --git a/...ed/src/main/scala/scalan/ModuleInfo.scala → ...ed/src/main/scala/scalan/ModuleInfo.scala b/...ed/src/main/scala/scalan/ModuleInfo.scala → ...ed/src/main/scala/scalan/ModuleInfo.scala
diff --git a/...hared/src/main/scala/scalan/Modules.scala → ...hared/src/main/scala/scalan/Modules.scala b/...hared/src/main/scala/scalan/Modules.scala → ...hared/src/main/scala/scalan/Modules.scala
diff --git a/...d/src/main/scala/scalan/MutableLazy.scala → ...d/src/main/scala/scalan/MutableLazy.scala b/...d/src/main/scala/scalan/MutableLazy.scala → ...d/src/main/scala/scalan/MutableLazy.scala
diff --git a/...shared/src/main/scala/scalan/Scalan.scala → sc/shared/src/main/scala/scalan/Scalan.scala b/...shared/src/main/scala/scalan/Scalan.scala → sc/shared/src/main/scala/scalan/Scalan.scala
diff --git a/.../src/main/scala/scalan/SigmaLibrary.scala → .../src/main/scala/scalan/SigmaLibrary.scala b/.../src/main/scala/scalan/SigmaLibrary.scala → .../src/main/scala/scalan/SigmaLibrary.scala
diff --git a/...red/src/main/scala/scalan/TypeDescs.scala → ...red/src/main/scala/scalan/TypeDescs.scala b/...red/src/main/scala/scalan/TypeDescs.scala → ...red/src/main/scala/scalan/TypeDescs.scala
diff --git a/...src/main/scala/scalan/meta/SSymName.scala → ...src/main/scala/scalan/meta/SSymName.scala b/...src/main/scala/scalan/meta/SSymName.scala → ...src/main/scala/scalan/meta/SSymName.scala
diff --git a/.../main/scala/scalan/primitives/Equal.scala → .../main/scala/scalan/primitives/Equal.scala b/.../main/scala/scalan/primitives/Equal.scala → .../main/scala/scalan/primitives/Equal.scala
diff --git a/...n/scala/scalan/primitives/Functions.scala → ...n/scala/scalan/primitives/Functions.scala b/...n/scala/scalan/primitives/Functions.scala → ...n/scala/scalan/primitives/Functions.scala
diff --git a/.../scala/scalan/primitives/IfThenElse.scala → .../scala/scalan/primitives/IfThenElse.scala b/.../scala/scalan/primitives/IfThenElse.scala → .../scala/scalan/primitives/IfThenElse.scala
diff --git a/.../scala/scalan/primitives/LogicalOps.scala → .../scala/scalan/primitives/LogicalOps.scala b/.../scala/scalan/primitives/LogicalOps.scala → .../scala/scalan/primitives/LogicalOps.scala
diff --git a/.../scala/scalan/primitives/NumericOps.scala → .../scala/scalan/primitives/NumericOps.scala b/.../scala/scalan/primitives/NumericOps.scala → .../scala/scalan/primitives/NumericOps.scala
diff --git a/...scala/scalan/primitives/OrderingOps.scala → ...scala/scalan/primitives/OrderingOps.scala b/...scala/scalan/primitives/OrderingOps.scala → ...scala/scalan/primitives/OrderingOps.scala
diff --git a/...main/scala/scalan/primitives/Thunks.scala → ...main/scala/scalan/primitives/Thunks.scala b/...main/scala/scalan/primitives/Thunks.scala → ...main/scala/scalan/primitives/Thunks.scala
diff --git a/...main/scala/scalan/primitives/Tuples.scala → ...main/scala/scalan/primitives/Tuples.scala b/...main/scala/scalan/primitives/Tuples.scala → ...main/scala/scalan/primitives/Tuples.scala
diff --git a/...in/scala/scalan/primitives/UnBinOps.scala → ...in/scala/scalan/primitives/UnBinOps.scala b/...in/scala/scalan/primitives/UnBinOps.scala → ...in/scala/scalan/primitives/UnBinOps.scala
diff --git a/...cala/scalan/primitives/UniversalOps.scala → ...cala/scalan/primitives/UniversalOps.scala b/...cala/scalan/primitives/UniversalOps.scala → ...cala/scalan/primitives/UniversalOps.scala
diff --git a/.../main/scala/scalan/staged/AstGraphs.scala → .../main/scala/scalan/staged/AstGraphs.scala b/.../main/scala/scalan/staged/AstGraphs.scala → .../main/scala/scalan/staged/AstGraphs.scala
diff --git a/...n/scala/scalan/staged/ProgramGraphs.scala → ...n/scala/scalan/staged/ProgramGraphs.scala b/...n/scala/scalan/staged/ProgramGraphs.scala → ...n/scala/scalan/staged/ProgramGraphs.scala
diff --git a/...in/scala/scalan/staged/Transforming.scala → ...in/scala/scalan/staged/Transforming.scala b/...in/scala/scalan/staged/Transforming.scala → ...in/scala/scalan/staged/Transforming.scala
diff --git a/...src/main/scala/scalan/util/Variance.scala → ...src/main/scala/scalan/util/Variance.scala b/...src/main/scala/scalan/util/Variance.scala → ...src/main/scala/scalan/util/Variance.scala
diff --git a/.../scala/special/collection/CollsUnit.scala → .../scala/special/collection/CollsUnit.scala b/.../scala/special/collection/CollsUnit.scala → .../scala/special/collection/CollsUnit.scala
diff --git a/...a/special/collection/impl/CollsImpl.scala → ...a/special/collection/impl/CollsImpl.scala b/...a/special/collection/impl/CollsImpl.scala → ...a/special/collection/impl/CollsImpl.scala
diff --git a/...in/scala/special/sigma/SigmaDslUnit.scala → ...in/scala/special/sigma/SigmaDslUnit.scala b/...in/scala/special/sigma/SigmaDslUnit.scala → ...in/scala/special/sigma/SigmaDslUnit.scala
diff --git a/...ala/special/sigma/impl/SigmaDslImpl.scala → ...ala/special/sigma/impl/SigmaDslImpl.scala b/...ala/special/sigma/impl/SigmaDslImpl.scala → ...ala/special/sigma/impl/SigmaDslImpl.scala
diff --git a/...ecial/sigma/wrappers/WrappersModule.scala → ...ecial/sigma/wrappers/WrappersModule.scala b/...ecial/sigma/wrappers/WrappersModule.scala → ...ecial/sigma/wrappers/WrappersModule.scala
diff --git a/...ala/special/wrappers/WrappersModule.scala → ...ala/special/wrappers/WrappersModule.scala b/...ala/special/wrappers/WrappersModule.scala → ...ala/special/wrappers/WrappersModule.scala
diff --git a/.../main/scala/wrappers/scala/WOptions.scala → .../main/scala/wrappers/scala/WOptions.scala b/.../main/scala/wrappers/scala/WOptions.scala → .../main/scala/wrappers/scala/WOptions.scala
diff --git a/...la/wrappers/scala/impl/WOptionsImpl.scala → ...la/wrappers/scala/impl/WOptionsImpl.scala b/...la/wrappers/scala/impl/WOptionsImpl.scala → ...la/wrappers/scala/impl/WOptionsImpl.scala
diff --git a/.../main/scala/wrappers/scalan/WRTypes.scala → .../main/scala/wrappers/scalan/WRTypes.scala b/.../main/scala/wrappers/scalan/WRTypes.scala → .../main/scala/wrappers/scalan/WRTypes.scala
diff --git a/...la/wrappers/scalan/impl/WRTypesImpl.scala → ...la/wrappers/scalan/impl/WRTypesImpl.scala b/...la/wrappers/scalan/impl/WRTypesImpl.scala → ...la/wrappers/scalan/impl/WRTypesImpl.scala
diff --git a/...la/wrappers/special/WSpecialPredefs.scala → ...la/wrappers/special/WSpecialPredefs.scala b/...la/wrappers/special/WSpecialPredefs.scala → ...la/wrappers/special/WSpecialPredefs.scala
diff --git a/...rs/special/impl/WSpecialPredefsImpl.scala → ...rs/special/impl/WSpecialPredefsImpl.scala b/...rs/special/impl/WSpecialPredefsImpl.scala → ...rs/special/impl/WSpecialPredefsImpl.scala
diff --git a/...test/scala/scalan/BaseLiftableTests.scala → ...test/scala/scalan/BaseLiftableTests.scala b/...test/scala/scalan/BaseLiftableTests.scala → ...test/scala/scalan/BaseLiftableTests.scala
diff --git a/.../src/test/scala/scalan/LibraryTests.scala → .../src/test/scala/scalan/LibraryTests.scala b/.../src/test/scala/scalan/LibraryTests.scala → .../src/test/scala/scalan/LibraryTests.scala
diff --git a/.../src/test/scala/scalan/TestContexts.scala → .../src/test/scala/scalan/TestContexts.scala b/.../src/test/scala/scalan/TestContexts.scala → .../src/test/scala/scalan/TestContexts.scala
diff --git a/...d/src/test/scala/scalan/TestLibrary.scala → ...d/src/test/scala/scalan/TestLibrary.scala b/...d/src/test/scala/scalan/TestLibrary.scala → ...d/src/test/scala/scalan/TestLibrary.scala
diff --git a/...est/scala/scalan/util/ScalaNameUtil.scala → ...est/scala/scalan/util/ScalaNameUtil.scala b/...est/scala/scalan/util/ScalaNameUtil.scala → ...est/scala/scalan/util/ScalaNameUtil.scala
diff --git a/...cala/scalan/util/ScalaNameUtilSuite.scala → ...cala/scalan/util/ScalaNameUtilSuite.scala b/...cala/scalan/util/ScalaNameUtilSuite.scala → ...cala/scalan/util/ScalaNameUtilSuite.scala
diff --git a/...ecial/collections/CollsStagingTests.scala → ...ecial/collections/CollsStagingTests.scala b/...ecial/collections/CollsStagingTests.scala → ...ecial/collections/CollsStagingTests.scala
diff --git a/...scala/special/wrappers/WOptionTests.scala → ...scala/special/wrappers/WOptionTests.scala b/...scala/special/wrappers/WOptionTests.scala → ...scala/special/wrappers/WOptionTests.scala
diff --git a/.../scala/special/wrappers/WRTypeTests.scala → .../scala/special/wrappers/WRTypeTests.scala b/.../scala/special/wrappers/WRTypeTests.scala → .../scala/special/wrappers/WRTypeTests.scala
diff --git a/...pecial/wrappers/WSpecialPredefTests.scala → ...pecial/wrappers/WSpecialPredefTests.scala b/...pecial/wrappers/WSpecialPredefTests.scala → ...pecial/wrappers/WSpecialPredefTests.scala
diff --git a/...cala/special/wrappers/WrappersTests.scala → ...cala/special/wrappers/WrappersTests.scala b/...cala/special/wrappers/WrappersTests.scala → ...cala/special/wrappers/WrappersTests.scala