move ir node defs into subpackage of ir (#14783)

## Change Description Move the definitions of the IR nodes from package `ir` into a subpackage `ir.defs`. I originally did this to prepare for codegenerating the node definitions. While I don't think it was necessary in the end, I still think this is a beneficial change, as the `ir` package has become a big pile of different functionality, and it would be good to start breaking it up. ## Security Assessment - This change has no security impact ### Impact Description Non-functional change, only changes the java package paths of some classes. (Reviewers: please confirm the security impact before approving)
hail-is · Jan 28, 2025 · 99a6884 · 99a6884
1 parent 1fb8b5b
commit 99a6884
Show file tree

Hide file tree

Showing 132 changed files with 1,436 additions and 1,183 deletions.
diff --git a/hail/hail/src/is/hail/annotations/BroadcastValue.scala b/hail/hail/src/is/hail/annotations/BroadcastValue.scala
@@ -2,7 +2,7 @@ package is.hail.annotations
 
 import is.hail.asm4s.HailClassLoader
 import is.hail.backend.{BroadcastValue, ExecuteContext}
-import is.hail.expr.ir.EncodedLiteral
+import is.hail.expr.ir.defs.EncodedLiteral
 import is.hail.io.{BufferSpec, Decoder, TypedCodecSpec}
 import is.hail.types.physical.{PArray, PStruct, PType}
 import is.hail.types.virtual.{TBaseStruct, TStruct}

diff --git a/hail/hail/src/is/hail/backend/local/LocalBackend.scala b/hail/hail/src/is/hail/backend/local/LocalBackend.scala
@@ -8,6 +8,7 @@ import is.hail.backend.py4j.Py4JBackendExtensions
 import is.hail.expr.Validate
 import is.hail.expr.ir._
 import is.hail.expr.ir.analyses.SemanticHash
+import is.hail.expr.ir.defs.MakeTuple
 import is.hail.expr.ir.lowering._
 import is.hail.io.fs._
 import is.hail.linalg.BlockMatrix

diff --git a/hail/hail/src/is/hail/backend/py4j/Py4JBackendExtensions.scala b/hail/hail/src/is/hail/backend/py4j/Py4JBackendExtensions.scala
@@ -4,11 +4,11 @@ import is.hail.HailFeatureFlags
 import is.hail.backend.{Backend, ExecuteContext, NonOwningTempFileManager, TempFileManager}
 import is.hail.expr.{JSONAnnotationImpex, SparkAnnotationImpex}
 import is.hail.expr.ir.{
-  BaseIR, BindingEnv, BlockMatrixIR, EncodedLiteral, GetFieldByIdx, IR, IRParser,
-  IRParserEnvironment, Interpret, MatrixIR, MatrixNativeReader, MatrixRead, Name,
-  NativeReaderOptions, TableIR, TableLiteral, TableValue,
+  BaseIR, BindingEnv, BlockMatrixIR, IR, IRParser, IRParserEnvironment, Interpret, MatrixIR,
+  MatrixNativeReader, MatrixRead, Name, NativeReaderOptions, TableIR, TableLiteral, TableValue,
 }
 import is.hail.expr.ir.IRParser.parseType
+import is.hail.expr.ir.defs.{EncodedLiteral, GetFieldByIdx}
 import is.hail.expr.ir.functions.IRFunctionRegistry
 import is.hail.linalg.RowMatrix
 import is.hail.types.physical.PStruct

diff --git a/hail/hail/src/is/hail/backend/service/ServiceBackend.scala b/hail/hail/src/is/hail/backend/service/ServiceBackend.scala
@@ -6,10 +6,10 @@ import is.hail.asm4s._
 import is.hail.backend._
 import is.hail.expr.Validate
 import is.hail.expr.ir.{
-  Compile, IR, IRParser, IRSize, LoweringAnalyses, MakeTuple, SortField, TableIR, TableReader,
-  TypeCheck,
+  Compile, IR, IRParser, IRSize, LoweringAnalyses, SortField, TableIR, TableReader, TypeCheck,
 }
 import is.hail.expr.ir.analyses.SemanticHash
+import is.hail.expr.ir.defs.MakeTuple
 import is.hail.expr.ir.functions.IRFunctionRegistry
 import is.hail.expr.ir.lowering._
 import is.hail.io.fs._

diff --git a/hail/hail/src/is/hail/backend/spark/SparkBackend.scala b/hail/hail/src/is/hail/backend/spark/SparkBackend.scala
@@ -8,6 +8,7 @@ import is.hail.backend.py4j.Py4JBackendExtensions
 import is.hail.expr.Validate
 import is.hail.expr.ir._
 import is.hail.expr.ir.analyses.SemanticHash
+import is.hail.expr.ir.defs.MakeTuple
 import is.hail.expr.ir.lowering._
 import is.hail.io.{BufferSpec, TypedCodecSpec}
 import is.hail.io.fs._

diff --git a/hail/hail/src/is/hail/expr/Validate.scala b/hail/hail/src/is/hail/expr/Validate.scala
@@ -1,8 +1,7 @@
 package is.hail.expr
 
-import is.hail.expr.ir.{
-  BaseIR, BlockMatrixRead, BlockMatrixWrite, MatrixRead, MatrixWrite, TableRead, TableWrite,
-}
+import is.hail.expr.ir.{BaseIR, BlockMatrixRead, MatrixRead, TableRead}
+import is.hail.expr.ir.defs.{BlockMatrixWrite, MatrixWrite, TableWrite}
 import is.hail.utils._
 
 case class ValidateState(writeFilePaths: Set[String])

diff --git a/hail/hail/src/is/hail/expr/ir/Binds.scala b/hail/hail/src/is/hail/expr/ir/Binds.scala
@@ -1,5 +1,6 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
 import is.hail.types.tcoerce
 import is.hail.types.virtual._
 import is.hail.types.virtual.TIterable.elementType

diff --git a/hail/hail/src/is/hail/expr/ir/BlockMatrixIR.scala b/hail/hail/src/is/hail/expr/ir/BlockMatrixIR.scala
@@ -4,6 +4,7 @@ import is.hail.HailContext
 import is.hail.annotations.NDArray
 import is.hail.backend.{BackendContext, ExecuteContext}
 import is.hail.expr.Nat
+import is.hail.expr.ir.defs._
 import is.hail.expr.ir.lowering.{BMSContexts, BlockMatrixStage2, LowererUnsupportedOperation}
 import is.hail.io.{StreamBufferSpec, TypedCodecSpec}
 import is.hail.io.fs.FS

diff --git a/hail/hail/src/is/hail/expr/ir/BlockMatrixWriter.scala b/hail/hail/src/is/hail/expr/ir/BlockMatrixWriter.scala
@@ -5,6 +5,7 @@ import is.hail.annotations.Region
 import is.hail.asm4s._
 import is.hail.backend.ExecuteContext
 import is.hail.expr.Nat
+import is.hail.expr.ir.defs.{MetadataWriter, Str, UUID4, WriteMetadata, WriteValue}
 import is.hail.expr.ir.lowering.{BlockMatrixStage2, LowererUnsupportedOperation}
 import is.hail.io.{StreamBufferSpec, TypedCodecSpec}
 import is.hail.io.fs.FS

diff --git a/hail/hail/src/is/hail/expr/ir/Children.scala b/hail/hail/src/is/hail/expr/ir/Children.scala
@@ -1,5 +1,6 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
 import is.hail.utils._
 
 object Children {

diff --git a/hail/hail/src/is/hail/expr/ir/Compilable.scala b/hail/hail/src/is/hail/expr/ir/Compilable.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
+
 object InterpretableButNotCompilable {
   def apply(x: IR): Boolean = x match {
     case _: LiftMeOut => true

diff --git a/hail/hail/src/is/hail/expr/ir/Compile.scala b/hail/hail/src/is/hail/expr/ir/Compile.scala
@@ -4,6 +4,7 @@ import is.hail.annotations._
 import is.hail.asm4s._
 import is.hail.backend.{ExecuteContext, HailTaskContext}
 import is.hail.expr.ir.agg.AggStateSig
+import is.hail.expr.ir.defs.In
 import is.hail.expr.ir.lowering.LoweringPipeline
 import is.hail.expr.ir.streams.EmitStream
 import is.hail.io.fs.FS

diff --git a/hail/hail/src/is/hail/expr/ir/CompileAndEvaluate.scala b/hail/hail/src/is/hail/expr/ir/CompileAndEvaluate.scala
@@ -3,6 +3,7 @@ package is.hail.expr.ir
 import is.hail.annotations.{Region, SafeRow}
 import is.hail.asm4s._
 import is.hail.backend.ExecuteContext
+import is.hail.expr.ir.defs.{Begin, EncodedLiteral, Literal, MakeTuple, NA}
 import is.hail.expr.ir.lowering.LoweringPipeline
 import is.hail.types.physical.PTuple
 import is.hail.types.physical.stypes.PTypeReferenceSingleCodeType

diff --git a/hail/hail/src/is/hail/expr/ir/ComputeUsesAndDefs.scala b/hail/hail/src/is/hail/expr/ir/ComputeUsesAndDefs.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs.{BaseRef, Recur, Ref, RelationalRef}
+
 import scala.collection.mutable
 
 case class UsesAndDefs(

diff --git a/hail/hail/src/is/hail/expr/ir/Copy.scala b/hail/hail/src/is/hail/expr/ir/Copy.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
+
 object Copy {
   def apply(x: IR, newChildren: IndexedSeq[BaseIR]): IR = {
     x match {

diff --git a/hail/hail/src/is/hail/expr/ir/DeprecatedIRBuilder.scala b/hail/hail/src/is/hail/expr/ir/DeprecatedIRBuilder.scala
@@ -1,5 +1,6 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
 import is.hail.types.virtual._
 import is.hail.utils.{toRichIterable, FastSeq}
 

diff --git a/hail/hail/src/is/hail/expr/ir/Emit.scala b/hail/hail/src/is/hail/expr/ir/Emit.scala
@@ -7,6 +7,7 @@ import is.hail.expr.ir.agg.{AggStateSig, ArrayAggStateSig, GroupedStateSig}
 import is.hail.expr.ir.analyses.{
   ComputeMethodSplits, ControlFlowPreventsSplit, ParentPointers, SemanticHash,
 }
+import is.hail.expr.ir.defs._
 import is.hail.expr.ir.lowering.TableStageDependency
 import is.hail.expr.ir.ndarrays.EmitNDArray
 import is.hail.expr.ir.streams.{EmitStream, StreamProducer, StreamUtils}

diff --git a/hail/hail/src/is/hail/expr/ir/EmitClassBuilder.scala b/hail/hail/src/is/hail/expr/ir/EmitClassBuilder.scala
@@ -3,6 +3,7 @@ package is.hail.expr.ir
 import is.hail.annotations.{Region, RegionPool, RegionValueBuilder}
 import is.hail.asm4s._
 import is.hail.backend.{BackendUtils, ExecuteContext, HailTaskContext}
+import is.hail.expr.ir.defs.EncodedLiteral
 import is.hail.expr.ir.functions.IRRandomness
 import is.hail.expr.ir.orderings.{CodeOrdering, StructOrdering}
 import is.hail.io.{BufferSpec, InputBuffer, TypedCodecSpec}

diff --git a/hail/hail/src/is/hail/expr/ir/Env.scala b/hail/hail/src/is/hail/expr/ir/Env.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs.Ref
+
 object Env {
   type K = Name
 

diff --git a/hail/hail/src/is/hail/expr/ir/Exists.scala b/hail/hail/src/is/hail/expr/ir/Exists.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs._
+
 //
 // Search an IR tree for the first node satisfying some condition
 //

diff --git a/hail/hail/src/is/hail/expr/ir/ExtractIntervalFilters.scala b/hail/hail/src/is/hail/expr/ir/ExtractIntervalFilters.scala
@@ -2,6 +2,7 @@ package is.hail.expr.ir
 
 import is.hail.annotations.{ExtendedOrdering, IntervalEndpointOrdering, SafeRow}
 import is.hail.backend.ExecuteContext
+import is.hail.expr.ir.defs._
 import is.hail.rvd.PartitionBoundOrdering
 import is.hail.types.virtual._
 import is.hail.utils.{Interval, IntervalEndpoint, _}

diff --git a/hail/hail/src/is/hail/expr/ir/FoldConstants.scala b/hail/hail/src/is/hail/expr/ir/FoldConstants.scala
@@ -1,6 +1,7 @@
 package is.hail.expr.ir
 
 import is.hail.backend.ExecuteContext
+import is.hail.expr.ir.defs._
 import is.hail.types.virtual.{TStream, TVoid}
 import is.hail.utils.HailException
 

diff --git a/hail/hail/src/is/hail/expr/ir/ForwardLets.scala b/hail/hail/src/is/hail/expr/ir/ForwardLets.scala
@@ -1,6 +1,7 @@
 package is.hail.expr.ir
 
 import is.hail.backend.ExecuteContext
+import is.hail.expr.ir.defs.{BaseRef, Binding, Block, In, Ref, Str}
 import is.hail.types.virtual.TVoid
 import is.hail.utils.BoxedArrayBuilder
 

diff --git a/hail/hail/src/is/hail/expr/ir/ForwardRelationalLets.scala b/hail/hail/src/is/hail/expr/ir/ForwardRelationalLets.scala
@@ -1,5 +1,7 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs.{RelationalLet, RelationalRef}
+
 import scala.collection.mutable
 
 object ForwardRelationalLets {

diff --git a/hail/hail/src/is/hail/expr/ir/FreeVariables.scala b/hail/hail/src/is/hail/expr/ir/FreeVariables.scala
@@ -1,5 +1,6 @@
 package is.hail.expr.ir
 
+import is.hail.expr.ir.defs.Ref
 import is.hail.types.virtual.Type
 
 import scala.collection.mutable

diff --git a/hail/hail/src/is/hail/expr/ir/GenericTableValue.scala b/hail/hail/src/is/hail/expr/ir/GenericTableValue.scala
@@ -3,6 +3,7 @@ package is.hail.expr.ir
 import is.hail.annotations.Region
 import is.hail.asm4s._
 import is.hail.backend.ExecuteContext
+import is.hail.expr.ir.defs.{Literal, PartitionReader, ReadPartition, ToStream}
 import is.hail.expr.ir.functions.UtilFunctions
 import is.hail.expr.ir.lowering.{TableStage, TableStageDependency}
 import is.hail.expr.ir.streams.StreamProducer