Separate build modules for compiler and web

Author: petrohi

Dockerfile

@@ -6,10 +6,12 @@ WORKDIR /work
 COPY mill build.sc ./
 ADD common ./common
 ADD tools ./tools
+ADD compiler ./compiler
+ADD emulator ./emulator
 ADD rtl ./rtl
 
 RUN ls -la
-RUN ./mill '{rtl,tools,emulator}.assembly'
+RUN ./mill '{rtl,compiler,emulator}.assembly'
 
 FROM azul/zulu-openjdk:11 as models
 
@@ -31,7 +33,7 @@ COPY ./arch/* /demo/arch/
 
 RUN mkdir -p /opt/tensil
 COPY --from=build /work/out/rtl/assembly.dest/out.jar /opt/tensil/rtl.jar
-COPY --from=build /work/out/tools/assembly.dest/out.jar /opt/tensil/compiler.jar
+COPY --from=build /work/out/compiler/assembly.dest/out.jar /opt/tensil/compiler.jar
 COPY --from=build /work/out/emulator/assembly.dest/out.jar /opt/tensil/emulator.jar
 
 COPY ./docker/bin/* /usr/bin/

README.md

@@ -105,7 +105,7 @@ rm main.tar.gz
 ### Run compiler from source code
 
 ```
-./mill tools.run -a ./arch/pynqz1.tarch -m ./models/resnet20v2_cifar.onnx -o "Identity:0" -s true
+./mill compiler.run -a ./arch/pynqz1.tarch -m ./models/resnet20v2_cifar.onnx -o "Identity:0" -s true
 ```
 
 ### Run emulator from source code

build.sc

@@ -31,30 +31,44 @@ object tools extends ScalaPBModule { m =>
   def scalaVersion   = common.scalaVersion
   def scalaPBVersion = "0.11.6"
 
-  def mainClass = Some("tensil.tools.Main")
-
-  override def ivyDeps =
-    common.ivyDeps() ++ super.ivyDeps() ++ Agg(
-      ivy"com.github.seratch::awscala-s3:0.8.5",
-      ivy"com.github.seratch::awscala-sqs:0.8.5",
-      ivy"com.github.seratch::awscala-dynamodb:0.8.5",
-    )
-
   object test extends Tests with TestModule.ScalaTest {
     def forkArgs = Seq("-Xmx12g", "-Xmx12g")
 
     def ivyDeps = m.ivyDeps() ++ Agg(ivy"org.scalatest::scalatest:3.0.4")
   }
 }
 
+object compiler extends ScalaModule { m =>
+  def moduleDeps = Seq(tools)
+
+  def scalaVersion = tools.scalaVersion
+
+  def mainClass = Some("tensil.tools.compiler.Main")
+}
+
 object emulator extends ScalaModule { m =>
   def moduleDeps = Seq(tools)
 
-  def scalaVersion   = tools.scalaVersion
+  def scalaVersion = tools.scalaVersion
 
   def mainClass = Some("tensil.tools.emulator.Main")
 }
 
+object web extends ScalaModule { m =>
+  def moduleDeps = Seq(tools)
+
+  def scalaVersion = tools.scalaVersion
+
+  override def ivyDeps =
+    tools.ivyDeps() ++ super.ivyDeps() ++ Agg(
+      ivy"com.github.seratch::awscala-s3:0.8.5",
+      ivy"com.github.seratch::awscala-sqs:0.8.5",
+      ivy"com.github.seratch::awscala-dynamodb:0.8.5",
+    )
+
+  def mainClass = Some("tensil.tools.web.Main")
+}
+
 object rtl extends SbtModule { m =>
   def moduleDeps = Seq(common)
 

tools/src/tensil/tools/Main.scala renamed to compiler/src/tensil/tools/compiler/Main.scala

@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /* Copyright © 2019-2022 Tensil AI Company */
 
-package tensil.tools
+package tensil.tools.compiler
 
 import java.io.{DataOutputStream, FileOutputStream}
 import tensil.{Architecture, ArchitectureDataType, InstructionLayout}
+import tensil.tools.{Compiler, CompilerOptions, CompilerInputShapes}
 
 import java.io.File
 import tensil.TablePrinter

tools/src/tensil/tools/web/CompilerTask.scala renamed to web/src/tensil/tools/web/Main.scala

@@ -239,7 +239,7 @@ object CompilerTask {
   }
 }
 
-object CompilerApp extends App {
+object Main extends App {
   // Number of tasks to be configured from container environment
   CompilerTask.process(1)
 }