rm cacheservers

QuantumBFS · Jun 29, 2018 · 7da065a · 7da065a
1 parent ef0206c
commit 7da065a
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 294 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,6 +1,7 @@
 julia 0.6
 Compat
 DataStructures
+CacheServers
 StaticArrays
 MacroTools
 Reexport

diff --git a/docs/make.jl b/docs/make.jl
@@ -1,13 +1,13 @@
 using Documenter
-using Yao, Yao.Blocks, Yao.LuxurySparse, Yao.CacheServers, Yao.Intrinsics, Yao.Registers, Yao.Interfaces
+using Yao, Yao.Blocks, Yao.LuxurySparse, Yao.Intrinsics, Yao.Registers, Yao.Interfaces
 
 # TODO: use Literate to process examples
 # using Literate
 # preprocess tutorial scripts
 
 # make documents
 makedocs(
-    modules = [Yao, Yao.Blocks, Yao.LuxurySparse, Yao.CacheServers, Yao.Intrinsics, Yao.Registers, Yao.Interfaces],
+    modules = [Yao, Yao.Blocks, Yao.LuxurySparse, Yao.Intrinsics, Yao.Registers, Yao.Interfaces],
     clean = false,
     format = :html,
     sitename = "Yao.jl",

diff --git a/src/Blocks/Blocks.jl b/src/Blocks/Blocks.jl
@@ -6,18 +6,20 @@ using Compat.Iterators
 using Compat.LinearAlgebra
 using Compat.SparseArrays
 using Lazy: @forward
+using CacheServers
 
 using ..Intrinsics
 using ..Registers
 using ..LuxurySparse
-using ..CacheServers
+
 
 # import package APIs
 import ..Yao
 import ..Yao: DefaultType, nqubits, nactive, invorder
 import ..Registers: focus!, relax!
 import ..Intrinsics: ishermitian, isunitary, isreflexive
-import ..CacheServers: update!, iscached, clear!, pull, iscacheable
+
+import CacheServers: update!, iscached, clear!, pull, iscacheable
 import Base: copy, hash, ==, eltype, show, similar, getindex, setindex!, start, next, done, length, parent
 import Compat: adjoint
 

diff --git a/src/CacheServers/CacheServers.jl b/src/CacheServers/CacheServers.jl
diff --git a/src/CacheServers/Core.jl b/src/CacheServers/Core.jl
diff --git a/src/CacheServers/Default.jl b/src/CacheServers/Default.jl
diff --git a/src/Interfaces/Interfaces.jl b/src/Interfaces/Interfaces.jl
@@ -4,9 +4,10 @@ using Reexport
 using ..Registers
 using ..Blocks
 using ..Blocks: _blockpromote
-using ..CacheServers
 using ..Intrinsics
 
+using CacheServers
+
 # import package configs
 import ..Yao: DefaultType
 

diff --git a/src/Yao.jl b/src/Yao.jl
@@ -35,7 +35,6 @@ end
 include("APIs.jl")
 
 include("LuxurySparse/LuxurySparse.jl")
-include("CacheServers/CacheServers.jl")
 
 include("Intrinsics/Intrinsics.jl")
 include("Registers/Registers.jl")

diff --git a/test/Blocks/CacheFragment.jl b/test/Blocks/CacheFragment.jl
@@ -2,7 +2,7 @@ using Compat
 using Compat.Test
 
 using Yao.Blocks
-using Yao.CacheServers
+using CacheServers
 using Yao.LuxurySparse
 
 @testset "constructor" begin

diff --git a/test/Blocks/CachedBlock.jl b/test/Blocks/CachedBlock.jl
@@ -3,7 +3,7 @@ using Compat.Test
 
 using Yao
 using Yao.Blocks
-using Yao.CacheServers
+using CacheServers
 using Yao.LuxurySparse
 
 s = DefaultServer{MatrixBlock, CacheFragment}()

diff --git a/test/CacheServers/CacheServers.jl b/test/CacheServers/CacheServers.jl
diff --git a/test/CacheServers/Core.jl b/test/CacheServers/Core.jl
diff --git a/test/CacheServers/Default.jl b/test/CacheServers/Default.jl
diff --git a/test/CacheServers/TestFragment.jl b/test/CacheServers/TestFragment.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -18,10 +18,6 @@ end
 include("Blocks/Blocks.jl")
 end
 
-@testset "cache" begin
-include("CacheServers/CacheServers.jl")
-end
-
 @testset "boost" begin
 include("Boost/Boost.jl")
 end