parser related impl is now moved into its own package, not useful in …

…most cases cleanup common change NullSafeMagnet type alias to avoid Scala 3 syntax conflict evict DSL component for Spark ML pipeline, not useful in heterogeneous inference
tribbloid · Feb 20, 2024 · 1dd6bb8 · 1dd6bb8
1 parent bd04184
commit 1dd6bb8
Show file tree

Hide file tree

Showing 127 changed files with 242 additions and 4,395 deletions.
diff --git a/parent/benchmark/build.gradle.kts b/parent/benchmark/build.gradle.kts
@@ -4,5 +4,6 @@ val vs = versions()
 dependencies {
 
     api(project(":parent:core"))
+    api(project(":parent:parsing"))
     testFixturesApi(testFixtures(project(":parent:core")))
 }
diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/AutomaticRelay.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/AutomaticRelay.scala
@@ -1,6 +1,6 @@
 package com.tribbloids.spookystuff.relay
 
-import org.apache.spark.ml.dsl.utils.refl.ReflectionUtils
+import com.tribbloids.spookystuff.utils.refl.ReflectionUtils
 
 object AutomaticRelay {}
 

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/RelayRegistry.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/RelayRegistry.scala
@@ -1,7 +1,6 @@
 package com.tribbloids.spookystuff.relay
 
-import org.apache.spark.ml.dsl.utils.refl.TypeMagnet
-
+import com.tribbloids.spookystuff.utils.refl.TypeMagnet
 import scala.collection.mutable
 import scala.util.{Failure, Success, Try}
 

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/RootTagged.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/RootTagged.scala
@@ -1,6 +1,6 @@
 package com.tribbloids.spookystuff.relay
 
-import org.apache.spark.ml.dsl.utils.refl.TypeMagnet
+import com.tribbloids.spookystuff.utils.refl.TypeMagnet
 
 trait RootTagged {
 

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/TreeIR.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/relay/TreeIR.scala
@@ -2,7 +2,7 @@ package com.tribbloids.spookystuff.relay
 
 import com.tribbloids.spookystuff.tree.TreeView
 import com.tribbloids.spookystuff.relay.io.Decoder
-import org.apache.spark.ml.dsl.utils.refl.ReflectionUtils
+import com.tribbloids.spookystuff.utils.refl.ReflectionUtils
 
 import scala.collection.immutable.ListMap
 import scala.language.implicitConversions

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/Types.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/Types.scala
@@ -2,5 +2,5 @@ package com.tribbloids.spookystuff.utils
 
 object Types {
 
-  type Binary[T] = (T, T) => T
+  type Compose[T] = (T, T) => T
 }
diff --git a/...org/apache/spark/ml/dsl/UnsafeUtils.scala → ...spookystuff/utils/UnsafeReflections.scala b/...org/apache/spark/ml/dsl/UnsafeUtils.scala → ...spookystuff/utils/UnsafeReflections.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.spark.ml.dsl
+package com.tribbloids.spookystuff.utils
 
-object UnsafeUtils {
+object UnsafeReflections {
 
   def setSuperField(obj: Object, fieldName: String, fieldValue: Object): Unit = {
     setAncestorField(obj, 1, fieldName, fieldValue)

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/data/AttrLike.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/data/AttrLike.scala
@@ -1,7 +1,7 @@
 package com.tribbloids.spookystuff.utils.data
 
 import ai.acyclic.prover.commons.same.EqualBy
-import org.apache.spark.ml.dsl.utils.?
+import org.apache.spark.ml.dsl.utils.??
 
 import scala.util.Try
 
@@ -17,7 +17,7 @@ trait AttrLike[T] extends Serializable with EqualBy {
     Magnets.AttrValueMag[T](this.name, Some(v))
   }
 
-  def -?>(vOpt: T `?` _): Magnets.AttrValueMag[T] = {
+  def -?>(vOpt: T ?? _): Magnets.AttrValueMag[T] = {
 
     Magnets.AttrValueMag[T](this.name, vOpt.asOption)
   }

diff --git a/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/data/EAVLike.scala b/parent/commons/src/main/scala/com/tribbloids/spookystuff/utils/data/EAVLike.scala
@@ -3,7 +3,7 @@ package com.tribbloids.spookystuff.utils.data
 import com.tribbloids.spookystuff.relay.RootTagged
 import com.tribbloids.spookystuff.relay.xml.Xml
 import com.tribbloids.spookystuff.utils.{CommonUtils, TreeThrowable}
-import org.apache.spark.ml.dsl.utils.{?, HasEagerInnerObjects}
+import org.apache.spark.ml.dsl.utils.{??, HasEagerInnerObjects}
 
 import java.util.Properties
 import scala.collection.mutable
@@ -136,8 +136,8 @@ trait EAVLike extends HasEagerInnerObjects with RootTagged with Serializable {
       // should only be used in setters
       val aliases: List[String] = Nil,
       nullable: Boolean = false,
-      default: T `?` _ = None,
-      nameOverride: String `?` _ = None
+      default: T ?? _ = None,
+      nameOverride: String ?? _ = None
   )(
       implicit
       ev: T <:< Any

diff --git a/...ml/dsl/utils/refl/CatalystTypeMixin.scala → ...ystuff/utils/refl/CatalystTypeMixin.scala b/...ml/dsl/utils/refl/CatalystTypeMixin.scala → ...ystuff/utils/refl/CatalystTypeMixin.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import org.apache.spark.sql.types.DataType
 

diff --git a/...k/ml/dsl/utils/refl/CatalystTypeOps.scala → ...okystuff/utils/refl/CatalystTypeOps.scala b/...k/ml/dsl/utils/refl/CatalystTypeOps.scala → ...okystuff/utils/refl/CatalystTypeOps.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import org.apache.spark.sql.types._
 

diff --git a/...rk/ml/dsl/utils/refl/FromClassMixin.scala → ...ookystuff/utils/refl/FromClassMixin.scala b/...rk/ml/dsl/utils/refl/FromClassMixin.scala → ...ookystuff/utils/refl/FromClassMixin.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import ai.acyclic.prover.commons.util.Caching
 

diff --git a/...ml/dsl/utils/refl/FromClassTagMixin.scala → ...ystuff/utils/refl/FromClassTagMixin.scala b/...ml/dsl/utils/refl/FromClassTagMixin.scala → ...ystuff/utils/refl/FromClassTagMixin.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import scala.language.implicitConversions
 import scala.reflect.ClassTag

diff --git a/...k/ml/dsl/utils/refl/ReflectionUtils.scala → ...okystuff/utils/refl/ReflectionUtils.scala b/...k/ml/dsl/utils/refl/ReflectionUtils.scala → ...okystuff/utils/refl/ReflectionUtils.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 //TODO: simply by using a common relay that different type representation can be cast into
 /**

diff --git a/...he/spark/ml/dsl/utils/refl/ScalaUDT.scala → ...ids/spookystuff/utils/refl/ScalaUDT.scala b/...he/spark/ml/dsl/utils/refl/ScalaUDT.scala → ...ids/spookystuff/utils/refl/ScalaUDT.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import java.nio.ByteBuffer
 

diff --git a/.../spark/ml/dsl/utils/refl/ToCatalyst.scala → ...s/spookystuff/utils/refl/ToCatalyst.scala b/.../spark/ml/dsl/utils/refl/ToCatalyst.scala → ...s/spookystuff/utils/refl/ToCatalyst.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import org.apache.spark.sql.types.DataType
 

diff --git a/.../spark/ml/dsl/utils/refl/TypeMagnet.scala → ...s/spookystuff/utils/refl/TypeMagnet.scala b/.../spark/ml/dsl/utils/refl/TypeMagnet.scala → ...s/spookystuff/utils/refl/TypeMagnet.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import com.tribbloids.spookystuff.utils.serialization.{SerializerEnv, SerializerOverride}
 

diff --git a/...e/spark/ml/dsl/utils/refl/TypeUtils.scala → ...ds/spookystuff/utils/refl/TypeUtils.scala b/...e/spark/ml/dsl/utils/refl/TypeUtils.scala → ...ds/spookystuff/utils/refl/TypeUtils.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import org.apache.spark.SparkException
 import org.apache.spark.sql.catalyst.ScalaReflection

diff --git a/...che/spark/ml/dsl/utils/refl/Unerase.scala → ...oids/spookystuff/utils/refl/Unerase.scala b/...che/spark/ml/dsl/utils/refl/Unerase.scala → ...oids/spookystuff/utils/refl/Unerase.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import scala.reflect.runtime.universe
 import scala.collection.concurrent.TrieMap

diff --git a/.../dsl/utils/refl/UnreifiedObjectType.scala → ...tuff/utils/refl/UnreifiedObjectType.scala b/.../dsl/utils/refl/UnreifiedObjectType.scala → ...tuff/utils/refl/UnreifiedObjectType.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.ml.dsl.utils.refl
+package com.tribbloids.spookystuff.utils.refl
 
 import org.apache.spark.sql.catalyst.ScalaReflection.universe._
 import org.apache.spark.sql.types._

diff --git a/parent/commons/src/main/scala/org/apache/spark/ml/dsl/AbstractNamedStage.scala b/parent/commons/src/main/scala/org/apache/spark/ml/dsl/AbstractNamedStage.scala
diff --git a/parent/commons/src/main/scala/org/apache/spark/ml/dsl/Compactions.scala b/parent/commons/src/main/scala/org/apache/spark/ml/dsl/Compactions.scala