Fix exports and namespace issues

src/Deprecated.jl

@@ -18,6 +18,7 @@
 @deprecate mul(A::AbstractMPS, B::AbstractMPS; kwargs...) contract(A, B; kwargs...)
 
 # mps/mpo.jl
+@deprecate toMPO(args...; kwargs...) MPO(args...; kwargs...)
 @deprecate MPO(A::MPS; kwargs...) outer(A', A; kwargs...)
 @deprecate randomMPO(args...; kwargs...) random_mpo(args...; kwargs...)
 

src/abstractmps.jl

@@ -1,7 +1,7 @@
 using IsApprox: Approx, IsApprox
 using ITensors: ITensors
 using NDTensors: NDTensors, using_auto_fermion, scalartype, tensor
-# TODO: Just load from `ITensors`, not from submodules.
+using ITensors.Ops: Prod
 using ITensors.QuantumNumbers: QuantumNumbers, removeqn
 using ITensors.SiteTypes: SiteTypes, siteinds
 using ITensors.TagSets: TagSets

src/exports.jl

@@ -1,5 +1,43 @@
 using LinearAlgebra: ⋅
 export
+  # Exports that were removed from ITensors.jl
+  # when ITensors.ITensorMPS was moved to ITensorMPS.jl.
+  @OpName_str,
+  @SiteType_str,
+  @StateName_str,
+  @TagType_str,
+  @ValName_str,
+  Apply,
+  Op,
+  OpName,
+  Ops,
+  Prod,
+  Scaled,
+  SiteType,
+  Spectrum,
+  StateName,
+  Sum,
+  TagType,
+  Trotter,
+  ValName,
+  apply,
+  argsdict,
+  coefficient,
+  contract,
+  convert_leaf_eltype,
+  eigs,
+  entropy,
+  has_fermion_string,
+  hassameinds,
+  linkindex,
+  ops,
+  replaceprime,
+  siteindex,
+  splitblocks,
+  tr,
+  truncerror,
+  val,
+
   # dmrg.jl
   dmrg,
   # abstractmps.jl
@@ -21,7 +59,6 @@ export
   lognorm,
   movesite,
   movesites,
-  normalize,
   ortho_lims,
   orthocenter,
   promote_itensor_eltype,
@@ -31,6 +68,7 @@ export
   sim!,
   # autompo/
   AutoMPO,
+  OpSum,
   add!,
   # mpo.jl
   # Types
@@ -61,6 +99,7 @@ export
   linkdims,
   linkind,
   linkinds,
+  op,
   productMPS,
   random_mps,
   replacebond,
@@ -69,6 +108,7 @@ export
   sample!,
   siteind,
   siteinds,
+  state,
   replace_siteinds!,
   replace_siteinds,
   swapbondsites,
@@ -86,7 +126,6 @@ export
   measurements,
   truncerrors,
   # projmpo.jl
-  checkflux,
   disk,
   ProjMPO,
   lproj,

src/mpo.jl

@@ -1,7 +1,8 @@
 using Adapt: adapt
 using LinearAlgebra: dot
 using Random: Random
-using ..SiteTypes: SiteTypes, siteind, siteinds
+using ITensors.Ops: OpSum
+using ITensors.SiteTypes: SiteTypes, siteind, siteinds
 
 """
     MPO

src/mps.jl

@@ -1,7 +1,7 @@
 using Adapt: adapt
 using NDTensors: using_auto_fermion
 using Random: Random
-using ..SiteTypes: SiteTypes, siteind, siteinds
+using ITensors.SiteTypes: SiteTypes, siteind, siteinds, state
 
 """
     MPS

src/opsum_to_mpo/opsum_to_mpo_generic.jl

@@ -1,5 +1,6 @@
 using NDTensors: using_auto_fermion
-using ..Ops: Op
+using ITensors.Ops: Ops, Op, OpSum, Scaled, Sum, coefficient
+using ITensors.SiteTypes: has_fermion_string, op
 
 # TODO: Deprecate.
 const AutoMPO = OpSum

test/base/test_examples.jl

@@ -7,12 +7,7 @@ using Test: @test_nowarn, @testset
     @test_nowarn begin
       @capture_out begin
         include(
-          joinpath(
-            pkgdir(ITensorMPS),
-            "examples",
-            "dmrg",
-            "1d_ising_with_observer.jl",
-          ),
+          joinpath(pkgdir(ITensorMPS), "examples", "dmrg", "1d_ising_with_observer.jl")
         )
       end
     end
@@ -22,7 +17,10 @@ using Test: @test_nowarn, @testset
       @capture_out begin
         include(
           joinpath(
-            pkgdir(ITensorMPS), "ext", "ITensorMPSPackageCompilerExt", "precompile_itensormps.jl"
+            pkgdir(ITensorMPS),
+            "ext",
+            "ITensorMPSPackageCompilerExt",
+            "precompile_itensormps.jl",
           ),
         )
       end

test/base/test_exports.jl

@@ -1,31 +1,18 @@
 @eval module $(gensym())
 using ITensorMPS: ITensorMPS
-using ITensors: ITensors
 include("utils/TestITensorMPSExportedNames.jl")
 using Test: @test, @test_broken, @testset
 @testset "Exports and aliases" begin
   @testset "Exports" begin
+    # @show setdiff(names(ITensorMPS), TestITensorMPSExportedNames.ITENSORMPS_EXPORTED_NAMES)
+    # @show setdiff(TestITensorMPSExportedNames.ITENSORMPS_EXPORTED_NAMES, names(ITensorMPS))
     @test issetequal(
-      names(ITensorMPS),
-      [
-        [:ITensorMPS]
-        # ITensorTDVP reexports
-        [:TimeDependentSum, :dmrg_x, :expand, :linsolve, :tdvp, :to_vec]
-        # ITensors and ITensors.ITensorMPS reexports
-        TestITensorMPSExportedNames.ITENSORMPS_EXPORTED_NAMES
-      ],
+      names(ITensorMPS), TestITensorMPSExportedNames.ITENSORMPS_EXPORTED_NAMES
     )
   end
   @testset "Not exported" begin
-    for f in [
-      :AbstractProjMPO,
-      :ProjMPS,
-      :makeL!,
-      :makeR!,
-      :set_terms,
-      :sortmergeterms,
-      :terms,
-    ]
+    for f in
+        [:AbstractProjMPO, :ProjMPS, :makeL!, :makeR!, :set_terms, :sortmergeterms, :terms]
       @test isdefined(ITensorMPS, f)
       @test !Base.isexported(ITensorMPS, f)
     end

test/base/test_readme.jl

@@ -1,4 +1,4 @@
-using ITensors, Test
+using ITensorMPS, ITensors, Test
 
 @testset "README Examples" begin
   @testset "ITensor Basics" begin

test/base/test_solvers/test_tdvp.jl

@@ -1,15 +1,6 @@
 @eval module $(gensym())
 using ITensorMPS:
-  AbstractObserver,
-  MPO,
-  MPS,
-  OpSum,
-  apply,
-  expect,
-  inner,
-  random_mps,
-  siteinds,
-  tdvp
+  AbstractObserver, MPO, MPS, OpSum, apply, expect, inner, random_mps, siteinds, tdvp
 using ITensors: ITensors, ITensor, dag, noprime, op, prime, scalar
 using KrylovKit: exponentiate
 using LinearAlgebra: norm