Skip to content

Commit

Permalink
fix: Downgraded AbstractFFT to fix compile error
Browse files Browse the repository at this point in the history
This was discussed here: JuliaDSP/DSP.jl#306 and
will be fixed when a new version of DSP is released.
  • Loading branch information
haberdashPI committed Nov 12, 2019
1 parent 088fb9c commit b181de1
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 57 deletions.
34 changes: 20 additions & 14 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ git-tree-sha1 = "981354dab938901c2b607a213e62d9defa50b698"
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
version = "1.2.1"

[[ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "1ddfbcefdcb1d5417cf10a29e4ce3284a7ebb379"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "0.1.1"

[[AxisAlgorithms]]
deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"]
git-tree-sha1 = "a4d07a1c313392a77042855df46c5f534076fab9"
Expand Down Expand Up @@ -76,9 +82,9 @@ version = "1.0.0"

[[CSV]]
deps = ["CategoricalArrays", "DataFrames", "Dates", "FilePathsBase", "LazyArrays", "Mmap", "Parsers", "PooledArrays", "Profile", "Tables", "Unicode", "WeakRefStrings"]
git-tree-sha1 = "0c3201d16c65a1453be158189d48df7c357eb7fb"
git-tree-sha1 = "4194bc05efd054cdbf2765ce4a0d1497bf8eec65"
uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
version = "0.5.14"
version = "0.5.16"

[[CategoricalArrays]]
deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport", "Unicode"]
Expand Down Expand Up @@ -254,9 +260,9 @@ version = "0.6.2"

[[FillArrays]]
deps = ["LinearAlgebra", "Random", "SparseArrays"]
git-tree-sha1 = "de38b0253ade98340fabaf220f368f6144541938"
git-tree-sha1 = "6827a8f73ff12707f209c920d204238a16892b55"
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
version = "0.7.4"
version = "0.8.0"

[[FixedPointNumbers]]
deps = ["Test"]
Expand Down Expand Up @@ -312,9 +318,9 @@ version = "0.8.4"

[[ImageInTerminal]]
deps = ["ColorTypes", "Crayons", "ImageCore", "ImageTransformations"]
git-tree-sha1 = "f35c6a782e532394609099d54fe8ec64ef21fb6d"
git-tree-sha1 = "686a58a0e09367206b8e40d1c9431f603ab70b0c"
uuid = "d8c32880-2388-543b-8c61-d9f865259254"
version = "0.4.0"
version = "0.4.1"

[[ImageTransformations]]
deps = ["AxisAlgorithms", "ColorTypes", "ColorVectorSpace", "Colors", "CoordinateTransformations", "FixedPointNumbers", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "StaticArrays"]
Expand Down Expand Up @@ -403,10 +409,10 @@ uuid = "fcefd6c4-8de0-11e9-0d15-03bc7c8ec982"
version = "0.3.0"

[[LazyArrays]]
deps = ["FillArrays", "LinearAlgebra", "MacroTools", "StaticArrays"]
git-tree-sha1 = "01ec151cd0418fb05294b0230471765e0a65adb1"
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "StaticArrays"]
git-tree-sha1 = "4178993cd1c9570bca6dce62c84e73d85747fc85"
uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
version = "0.12.3"
version = "0.14.3"

[[LibGit2]]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
Expand Down Expand Up @@ -719,9 +725,9 @@ version = "0.8.0"

[[StaticArrays]]
deps = ["LinearAlgebra", "Random", "Statistics"]
git-tree-sha1 = "1085ffbf5fd48fdba64ef8e902ca429c4e1212d3"
git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
uuid = "90137ffa-7385-5640-81b9-e52037218182"
version = "0.11.1"
version = "0.12.1"

[[Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
Expand All @@ -740,10 +746,10 @@ uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
version = "0.9.0"

[[StatsModels]]
deps = ["CategoricalArrays", "DataStructures", "LinearAlgebra", "ShiftedArrays", "SparseArrays", "StatsBase", "Tables"]
git-tree-sha1 = "0d0e21a1c3e8043cbc1c4dd4b4e4189b0449e8cf"
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "ShiftedArrays", "SparseArrays", "StatsBase", "Tables"]
git-tree-sha1 = "f4a967704cae9426654cf4649561f263a6dc8419"
uuid = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
version = "0.6.6"
version = "0.6.7"

[[StructuredOptimization]]
deps = ["AbstractOperators", "DSP", "FFTW", "LinearAlgebra", "ProximalAlgorithms", "ProximalOperators", "RecursiveArrayTools"]
Expand Down
103 changes: 60 additions & 43 deletions src/julia/EEGCoding/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ git-tree-sha1 = "981354dab938901c2b607a213e62d9defa50b698"
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
version = "1.2.1"

[[ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "1ddfbcefdcb1d5417cf10a29e4ce3284a7ebb379"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "0.1.1"

[[AxisAlgorithms]]
deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"]
git-tree-sha1 = "a4d07a1c313392a77042855df46c5f534076fab9"
Expand Down Expand Up @@ -63,22 +69,22 @@ uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
version = "0.8.10"

[[BinaryProvider]]
deps = ["Libdl", "Logging", "SHA"]
git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648"
deps = ["Libdl", "SHA"]
git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
version = "0.5.6"
version = "0.5.8"

[[CSTParser]]
deps = ["Tokenize"]
git-tree-sha1 = "c69698c3d4a7255bc1b4bc2afc09f59db910243b"
git-tree-sha1 = "99dda94f5af21a4565dc2b97edf6a95485f116c3"
uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
version = "0.6.2"
version = "1.0.0"

[[CSV]]
deps = ["CategoricalArrays", "DataFrames", "Dates", "Mmap", "Parsers", "PooledArrays", "Profile", "Tables", "Unicode", "WeakRefStrings"]
git-tree-sha1 = "5e7c67bc2873b347cd20ee742c93d243f3df9e93"
deps = ["CategoricalArrays", "DataFrames", "Dates", "FilePathsBase", "LazyArrays", "Mmap", "Parsers", "PooledArrays", "Profile", "Tables", "Unicode", "WeakRefStrings"]
git-tree-sha1 = "4194bc05efd054cdbf2765ce4a0d1497bf8eec65"
uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
version = "0.5.13"
version = "0.5.16"

[[CategoricalArrays]]
deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport", "Unicode"]
Expand Down Expand Up @@ -159,9 +165,9 @@ version = "0.19.4"

[[DataStructures]]
deps = ["InteractiveUtils", "OrderedCollections"]
git-tree-sha1 = "2103e504f427e54ffa19af9ada225733a21f951f"
git-tree-sha1 = "1fe8fad5fc84686dcbc674aa255bc867a64f8132"
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
version = "0.17.3"
version = "0.17.5"

[[DataValueInterfaces]]
git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
Expand All @@ -182,9 +188,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

[[Distributions]]
deps = ["LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
git-tree-sha1 = "b419fcf95ef9c8cf4d6610cd323890ad66d64240"
git-tree-sha1 = "838a37797ac24c1b4c3353d46ec87ea6598f2308"
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
version = "0.21.3"
version = "0.21.7"

[[FFTW]]
deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"]
Expand All @@ -198,11 +204,17 @@ git-tree-sha1 = "351f001a78aa1b7ad2696e386e110b5abd071c71"
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
version = "1.0.7"

[[FilePathsBase]]
deps = ["Dates", "LinearAlgebra", "Printf", "Test", "UUIDs"]
git-tree-sha1 = "2cd6e2e7965934f72cb80251f760228e2264bab3"
uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
version = "0.7.0"

[[FillArrays]]
deps = ["LinearAlgebra", "Random", "SparseArrays"]
git-tree-sha1 = "a2e22cd210dfa3ad1e1e6291fb733741dfabcc9f"
git-tree-sha1 = "6827a8f73ff12707f209c920d204238a16892b55"
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
version = "0.7.3"
version = "0.8.0"

[[FixedPointNumbers]]
deps = ["Test"]
Expand Down Expand Up @@ -234,9 +246,9 @@ version = "0.8.4"

[[ImageInTerminal]]
deps = ["ColorTypes", "Crayons", "ImageCore", "ImageTransformations"]
git-tree-sha1 = "f35c6a782e532394609099d54fe8ec64ef21fb6d"
git-tree-sha1 = "686a58a0e09367206b8e40d1c9431f603ab70b0c"
uuid = "d8c32880-2388-543b-8c61-d9f865259254"
version = "0.4.0"
version = "0.4.1"

[[ImageTransformations]]
deps = ["AxisAlgorithms", "ColorTypes", "ColorVectorSpace", "Colors", "CoordinateTransformations", "FixedPointNumbers", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "StaticArrays"]
Expand All @@ -256,9 +268,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[Interpolations]]
deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"]
git-tree-sha1 = "e1bac96b5ef3ea23b50e801b4a988ec21861a47f"
git-tree-sha1 = "f5bf159a7705e2a705b0effa1be0c3d18e288fe1"
uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
version = "0.12.2"
version = "0.12.5"

[[IntervalSets]]
deps = ["Dates", "Statistics"]
Expand Down Expand Up @@ -306,6 +318,12 @@ git-tree-sha1 = "2a7d3e0970218915b42fc68a4976049cbfcc8438"
uuid = "fcefd6c4-8de0-11e9-0d15-03bc7c8ec982"
version = "0.3.0"

[[LazyArrays]]
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "StaticArrays"]
git-tree-sha1 = "4178993cd1c9570bca6dce62c84e73d85747fc85"
uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
version = "0.14.3"

[[LibGit2]]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

Expand Down Expand Up @@ -342,9 +360,9 @@ version = "1.0.2"

[[MathOptInterface]]
deps = ["BenchmarkTools", "LinearAlgebra", "OrderedCollections", "SparseArrays", "Test", "Unicode"]
git-tree-sha1 = "7088ff9a77e8ecd773cc788787ad027cfb627170"
git-tree-sha1 = "78427dcc212e0c0ad9658049bc56a50303ad9737"
uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
version = "0.9.5"
version = "0.9.7"

[[MathProgBase]]
deps = ["Compat"]
Expand Down Expand Up @@ -404,9 +422,9 @@ version = "0.4.2"

[[Parsers]]
deps = ["Dates", "Test"]
git-tree-sha1 = "ef0af6c8601db18c282d092ccbd2f01f3f0cd70b"
git-tree-sha1 = "c56ecb484f286639f161e712b8311f5ab77e8d32"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "0.3.7"
version = "0.3.8"

[[Pkg]]
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
Expand All @@ -420,20 +438,19 @@ version = "0.2.4"

[[Polynomials]]
deps = ["LinearAlgebra", "RecipesBase"]
git-tree-sha1 = "f7c0c07e82798aef542d60a6e6e85e39f4590750"
git-tree-sha1 = "ae71c2329790af97b7682b11241b3609e4d48626"
uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
version = "0.5.3"
version = "0.6.0"

[[PooledArrays]]
git-tree-sha1 = "6e8c38927cb6e9ae144f7277c753714861b27d14"
uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
version = "0.5.2"

[[PrettyPrinting]]
deps = ["Markdown", "Pkg"]
git-tree-sha1 = "d81528303e2715c32706d4519b2ddf0550805533"
git-tree-sha1 = "cb3bd68c8e0fabf6e13c10bdf11713068e748a79"
uuid = "54e16d92-306c-5ea0-a30b-337be88ac337"
version = "0.1.0"
version = "0.2.0"

[[Printf]]
deps = ["Unicode"]
Expand Down Expand Up @@ -462,10 +479,10 @@ uuid = "a725b495-10eb-56fe-b38b-717eba820537"
version = "0.10.3"

[[QuadGK]]
deps = ["DataStructures", "LinearAlgebra", "Test"]
git-tree-sha1 = "3ce467a8e76c6030d4c3786e7d3a73442017cdc0"
deps = ["DataStructures", "LinearAlgebra"]
git-tree-sha1 = "1af46bf083b9630a5b27d4fd94f496c5fca642a8"
uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
version = "2.0.3"
version = "2.1.1"

[[REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets"]
Expand Down Expand Up @@ -511,10 +528,10 @@ uuid = "ae029012-a4dd-5104-9daa-d747884805df"
version = "0.5.2"

[[Rmath]]
deps = ["BinaryProvider", "Libdl", "Random", "Statistics", "Test"]
git-tree-sha1 = "9a6c758cdf73036c3239b0afbea790def1dabff9"
deps = ["BinaryProvider", "Libdl", "Random", "Statistics"]
git-tree-sha1 = "9825383d3453f4606d77f0a5722495f38001c09e"
uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa"
version = "0.5.0"
version = "0.5.1"

[[Rotations]]
deps = ["LinearAlgebra", "StaticArrays", "Statistics"]
Expand All @@ -540,9 +557,9 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"

[[SignalOperators]]
deps = ["AxisArrays", "Compat", "DSP", "FileIO", "FillArrays", "LambdaFn", "MetaArrays", "PrettyPrinting", "Random", "Requires", "Statistics", "Unitful"]
git-tree-sha1 = "f03e097829b13bb8fd730dfd5e1f07d364372288"
git-tree-sha1 = "ca441337801a6ae71f75fe0548340e941916177d"
uuid = "4d633899-0529-4c96-b1ed-a77d049c39ef"
version = "0.1.4"
version = "0.2.0"

[[Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
Expand All @@ -558,16 +575,16 @@ deps = ["LinearAlgebra", "Random"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[[SpecialFunctions]]
deps = ["BinDeps", "BinaryProvider", "Libdl", "Test"]
git-tree-sha1 = "0b45dc2e45ed77f445617b99ff2adf0f5b0f23ea"
deps = ["BinDeps", "BinaryProvider", "Libdl"]
git-tree-sha1 = "3bdd374b6fd78faf0119b8c5d538788dbf910c6e"
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
version = "0.7.2"
version = "0.8.0"

[[StaticArrays]]
deps = ["LinearAlgebra", "Random", "Statistics"]
git-tree-sha1 = "1085ffbf5fd48fdba64ef8e902ca429c4e1212d3"
git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
uuid = "90137ffa-7385-5640-81b9-e52037218182"
version = "0.11.1"
version = "0.12.1"

[[Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
Expand All @@ -580,10 +597,10 @@ uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
version = "0.32.0"

[[StatsFuns]]
deps = ["Rmath", "SpecialFunctions", "Test"]
git-tree-sha1 = "b3a4e86aa13c732b8a8c0ba0c3d3264f55e6bb3e"
deps = ["Rmath", "SpecialFunctions"]
git-tree-sha1 = "67745a79d8e83a83737a7e17a383c54720a97f41"
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
version = "0.8.0"
version = "0.9.0"

[[StructuredOptimization]]
deps = ["AbstractOperators", "DSP", "FFTW", "LinearAlgebra", "ProximalAlgorithms", "ProximalOperators", "RecursiveArrayTools"]
Expand Down
2 changes: 2 additions & 0 deletions src/julia/EEGCoding/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ authors = ["David Little <[email protected]>"]
version = "0.1.1"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
CorticalSpectralTemporalResponses = "82ec0db2-aa68-11e9-08e4-e3d69fc08b96"
Expand Down Expand Up @@ -31,6 +32,7 @@ StructuredOptimization = "46cd3e9d-64ff-517d-a929-236bc1a1fc9d"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[compat]
AbstractFFTs = "0.4"
BSON = "≥0.2"
CorticalSpectralTemporalResponses = "≥0.4"
DataFrames = "≥0.19"
Expand Down

0 comments on commit b181de1

Please sign in to comment.