Update README; Revert to using Scala 2.12 as default; put generated programs in gen dir; Bump scalafmt version

Author: EmergentOrder

README.md

@@ -117,13 +117,13 @@ to build against all of Scala 2.11, 2.12, 2.13 and Dotty/3.0, where possible.
 Then you can add this to your project's build.sbt 
 
 ```scala
-libraryDependencies += "org.emergentorder.onnx" %% "onnx-scala" % "1.5.0-0.1.0-SNAPSHOT"
+libraryDependencies += "org.emergentorder.onnx" %% "onnx-scala" % "1.6.0-0.1.0-SNAPSHOT"
 ```
 
 or 
 
 ```scala
-libraryDependencies += "org.emergentorder.onnx" %% "onnx-scala-zio" % "1.5.0-0.1.0-SNAPSHOT"
+libraryDependencies += "org.emergentorder.onnx" %% "onnx-scala-zio" % "1.6.0-0.1.0-SNAPSHOT"
 ``` 
 
 and build away with the traits provided. Backend implementation (and other) PRs welcome!
@@ -140,15 +140,15 @@ export SBT_OPTS="-XX:+CMSClassUnloadingEnabled -Xmx28G -Xss8M -XX:MaxMetaspaceSi
 
 either each time in the terminal, or in your `~/.bashrc` file or equivalent, or you will encounter errors.
 
-Now, get `squeezenet.onnx` [here](https://s3.amazonaws.com/download.onnx/models/opset_8/squeezenet.tar.gz) (rename `model.onnx` from inside the tar.gz). This model and more can be found in the [ONNX Model Zoo](https://github.com/onnx/models).
+Now, get `squeezenet.onnx` [here](https://s3.amazonaws.com/download.onnx/models/opset_8/squeezenet.tar.gz) (rename `model.onnx` from inside the tar.gz and move it to: `programGenerator/.jvm/src/main/resources/`). This model and more can be found in the [ONNX Model Zoo](https://github.com/onnx/models).
 
 Then:
 
 ```
 sbt "project programGeneratorJVM" "run squeezenet.onnx"
 ```
 
-The resulting generated program appears as `programGenerator/src/main/scala/generatedprograms/Squeezenet.scala` and you can run `sbt compile` to confirm that the generated code compiles.
+The resulting generated program appears as `programGenerator/src/gen/scala/Squeezenet.scala` and you can run `sbt compile` to confirm that the generated code compiles.
 
 ## Program Execution
 
@@ -178,7 +178,7 @@ This mode is a work-in-progress.
 ### Example execution
 The most extensive working example at the moment is `zio/src/main/scala/NCFZIO.scala`, an implementation of Neural Collaborative Filtering, although you currently need to provide your own model file to load params from at `zio/.jvm/src/main/resources/NCF.onnx`. 
 
-This example provides full model execution via the `fullNCF` method and fine-grained execution via the `fineNCF` method.
+This example provides full model execution via the `fullNCF` method, while an example of fine-grained execution can be found at `zio/src/main/scala/NCFZIOFine.scala` in the `fineNCF` method.
 
 To run it, use: 
 ```
@@ -197,14 +197,14 @@ To take advantage of union types to express type constraints, a Dotty (Scala 3)
 
 The ZIO variant is not yet available for Dotty.
 
-Currently at ONNX 1.5.0.
+Currently at ONNX 1.6.0.
 
 
 ### Built With
 
 #### Core
 
-* [ONNX via JavaCPP Preset for ONNX 1.5.0](https://github.com/bytedeco/javacpp-presets/tree/master/onnx) - Open Neural Network Exchange / The missing bridge between Java and native C++ libraries (For access to Protobuf definitions and operator schemas)
+* [ONNX via JavaCPP Preset for ONNX 1.6.0](https://github.com/bytedeco/javacpp-presets/tree/master/onnx) - Open Neural Network Exchange / The missing bridge between Java and native C++ libraries (For access to Protobuf definitions and operator schemas)
 
 * [Spire](https://github.com/non/spire) - Typelevel project enabling generic numeric programming (For support for unsigned ints, complex numbers, the Numeric type class and type specialization to avoid boxing overhead)
 

backends/src/main/scala/NGraphBackend.scala

@@ -17,6 +17,7 @@ import spire.math.ULong
 import spire.math.Complex
 
 import org.emergentorder.onnx._
+import org.emergentorder.union._
 import org.bytedeco.javacpp._;
 import org.bytedeco.onnx.ModelProto;
 import org.bytedeco.onnx.global.onnx.ParseProtoFromBytes;

build.sbt

@@ -6,13 +6,13 @@ val scala213Version = "2.13.1"
 val spireVersion = "0.17.0-M1"
 val zioVersion = "1.0.0-RC13"
 val scalametaVersion = "4.2.3"
-val onnxJavaCPPPresetVersion = "1.5.0-1.5.1"
+val onnxJavaCPPPresetVersion = "1.6.0-1.5.2-SNAPSHOT"
 scalaVersion := scala212Version
 
 lazy val commonSettings = Seq(
   scalaJSUseMainModuleInitializer := true, //Test only
   organization := "org.emergentorder.onnx",
-  version := "1.5.0-0.1.0-SNAPSHOT",
+  version := "1.6.0-0.1.0-SNAPSHOT",
   resolvers += Resolver.mavenLocal,
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
   updateOptions := updateOptions.value.withLatestSnapshots(false),
@@ -31,7 +31,7 @@ lazy val common = (crossProject(JSPlatform, JVMPlatform, NativePlatform)
     )
   )
   .jvmSettings(
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     crossScalaVersions := Seq(
       dottyVersion,
       scala212Version,
@@ -41,7 +41,7 @@ lazy val common = (crossProject(JSPlatform, JVMPlatform, NativePlatform)
     publishArtifact in (Compile, packageDoc) := false
   )
   .jsSettings(
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     crossScalaVersions := Seq(scala212Version, scala211Version, scala213Version)
   )
   .nativeSettings(
@@ -58,7 +58,7 @@ lazy val programGenerator = (crossProject(JSPlatform, JVMPlatform)
   .settings(
     commonSettings,
     name := "onnx-scala-program-generator",
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     mainClass in (Compile, run) := Some(
       "org.emergentorder.onnx.ONNXProgramGenerator"
     ),
@@ -88,9 +88,9 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
   .settings(
     commonSettings,
     name := "onnx-scala-backends",
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     libraryDependencies ++= Seq(
-      "org.bytedeco" % "ngraph-platform" % "0.22.0-1.5.1"
+      "org.bytedeco" % "ngraph-platform" % "0.25.0-1.5.2-SNAPSHOT"
     ),
     publishArtifact in (Compile, packageDoc) := false
   )
@@ -110,7 +110,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
   .settings(
     commonSettings,
     name := "onnx-scala",
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     excludeFilter in unmanagedSources := (CrossVersion
       .partialVersion(scalaVersion.value) match {
       case Some((0, n)) => ("ONNXHelper.scala")
@@ -181,7 +181,7 @@ lazy val zio = (crossProject(JVMPlatform, JSPlatform)
   .settings(
     commonSettings,
     name := "onnx-scala-zio",
-    scalaVersion := scala213Version,
+//    scalaVersion := scala213Version,
     publishArtifact in (Compile, packageDoc) := false,
     libraryDependencies ++= (CrossVersion
       .partialVersion(scalaVersion.value) match {

common/src/main/scala/UnionType.scala

@@ -0,0 +1,33 @@
+/* Copyright 2017-19, Emmanouil Antonios Platanios, Alexander Merritt. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.emergentorder
+
+package object union{
+
+type ![A] = A => Nothing
+type !![A] = ![![A]]
+
+trait Disjunction[T] {
+  type or[S] = Disjunction[T with ![S]]
+  type create = ![T]
+}
+
+type Union[T] = {
+  type or[S] = Disjunction[![T]]#or[S]
+}
+
+type Contains[S, T] = !![S] <:< T
+}

core/src/main/scala/ONNX.scala

@@ -11,21 +11,9 @@ import spire.math.Numeric
 import spire.implicits._
 import spire.algebra.Field
 import scala.reflect.ClassTag
-package object onnx {
-
-  type ![A]  = A => Nothing
-  type !![A] = ![![A]]
-
-  trait Disjunction[T] {
-    type or[S]  = Disjunction[T with ![S]]
-    type create = ![T]
-  }
+import org.emergentorder.union._
 
-  type Union[T] = {
-    type or[S] = Disjunction[![T]]#or[S]
-  }
-
-  type Contains[S, T] = !![S] <:< T
+package object onnx {
 
   type UNil