From ed4e2ed6e5b58252a33f84b14aa6d1cf171181fe Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 28 Jun 2020 00:51:23 -0700 Subject: [PATCH 1/3] Update test/environments/main/Manifest.toml --- test/environments/main/Manifest.toml | 49 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/test/environments/main/Manifest.toml b/test/environments/main/Manifest.toml index 9af2cc99..e2840f9d 100644 --- a/test/environments/main/Manifest.toml +++ b/test/environments/main/Manifest.toml @@ -2,9 +2,9 @@ [[Aqua]] deps = ["Pkg", "Test"] -git-tree-sha1 = "6d9919fd851a2b092817ba3bc8d69cf369bd617f" +git-tree-sha1 = "0060f6e92605d768e1cb9e0ac3bd17966bc0209e" uuid = "4c88cf16-eb10-579e-8560-4a9242c79595" -version = "0.4.1" +version = "0.4.3" [[ArgCheck]] git-tree-sha1 = "59c256cf71c3982484ae4486ee86a3d7da891dea" @@ -13,18 +13,18 @@ version = "2.0.0" [[BangBang]] deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"] -git-tree-sha1 = "c9ad7258a3fe28cec503cda05dcd59afc9d2b4c3" +git-tree-sha1 = "3a67bd27ea6a4223a556c7b5191937479a3a717a" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.19" +version = "0.3.26" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "0198d18b28c093bef39872a22f1a897218a925f5" +git-tree-sha1 = "054993b6611376ddb40203e973e954fd9d1d1902" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.8.0" +version = "3.12.0" [[ConstructionBase]] git-tree-sha1 = "a2a6a5fea4d6f730ec4c18a76d27ec10e8ec1c50" @@ -32,9 +32,9 @@ uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" version = "1.0.0" [[DataAPI]] -git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" +git-tree-sha1 = "176e23402d80e7743fc26c19c681bfb11246af32" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.1.0" +version = "1.3.0" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -55,24 +55,24 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a" +git-tree-sha1 = "c5714d9bcdba66389612dc4c47ed827c64112997" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.1" +version = "0.8.2" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "646ebc3db49889ffeb4c36f89e5d82c6a26295ff" +git-tree-sha1 = "395fa1554c69735802bba37d9e7d9586fd44326c" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.24.7" +version = "0.24.11" [[Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[InitialValues]] -git-tree-sha1 = "ef18588a15dcd6aff37a09108d7b3754093d73be" +git-tree-sha1 = "f3458faa269a6edefb2c329c26fdc829771c993b" uuid = "22cec73e-a1b8-11e9-2c92-598750a2cf9c" -version = "0.2.2" +version = "0.2.7" [[InteractiveUtils]] deps = ["Markdown"] @@ -90,6 +90,7 @@ uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.0" [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -117,12 +118,12 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[Parsers]] deps = ["Dates", "Test"] -git-tree-sha1 = "d6d82d5bdbb75048e574cd2d2c89dfbf2c74250c" +git-tree-sha1 = "20ef902ea02f7000756a4bc19f7b9c24867c6211" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.0" +version = "1.0.6" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -173,9 +174,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SplittablesBase]] deps = ["Setfield", "Test"] -git-tree-sha1 = "824da53be38fd36c33c25ffc092fd5aacfe7a1e2" +git-tree-sha1 = "1f03a587a9cab12d41056cc65d0d871f5922bbd6" uuid = "171d559e-b47b-412a-8079-5efa626c420e" -version = "0.1.1" +version = "0.1.7" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -189,9 +190,9 @@ version = "1.0.0" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "242b7fde70b8bc6a30d6476adf17ca3cf1ced6ee" +git-tree-sha1 = "c45dcc27331febabc20d86cb3974ef095257dcf3" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.0.3" +version = "1.0.4" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -201,15 +202,15 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" deps = ["ArgCheck", "BangBang", "ConstructionBase", "InitialValues", "Referenceables", "Setfield", "SplittablesBase", "Transducers"] path = "../../.." uuid = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d" -version = "0.1.2-DEV" +version = "0.1.3-DEV" [[Transducers]] deps = ["ArgCheck", "BangBang", "Distributed", "InitialValues", "Logging", "Markdown", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "a4ba6941b31faec8dbc400f177109b1b0a846e46" +git-tree-sha1 = "6fd9d94795574be8927d0138d8db6dbf9450344d" repo-rev = "master" repo-url = "https://github.com/tkf/Transducers.jl.git" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.25-DEV" +version = "0.4.37-DEV" [[UUIDs]] deps = ["Random", "SHA"] From 225cf0cb06ef3a3e9ee46ae71d2e27b1061d472d Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 28 Jun 2020 01:24:09 -0700 Subject: [PATCH 2/3] Update: SplittablesBase Using commit: Fix halve(zip(product(...), ...)) https://github.com/JuliaFolds/SplittablesBase.jl/commit/cd7b109f0068e9619e6010e28c44bd5b5cba06e4 --- benchmark/Manifest.toml | 4 ++-- test/environments/main/Manifest.toml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/benchmark/Manifest.toml b/benchmark/Manifest.toml index 5b2ebcc1..6230196f 100644 --- a/benchmark/Manifest.toml +++ b/benchmark/Manifest.toml @@ -186,11 +186,11 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SplittablesBase]] deps = ["Setfield", "Test"] -git-tree-sha1 = "03cc689803be9746984073b7a999e457a6cf45d7" +git-tree-sha1 = "dde71ddb7a3e3d5ed01370f04d53a749f46ddf45" repo-rev = "master" repo-url = "https://github.com/tkf/SplittablesBase.jl.git" uuid = "171d559e-b47b-412a-8079-5efa626c420e" -version = "0.1.1-DEV" +version = "0.1.8-DEV" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] diff --git a/test/environments/main/Manifest.toml b/test/environments/main/Manifest.toml index e2840f9d..123f4ef7 100644 --- a/test/environments/main/Manifest.toml +++ b/test/environments/main/Manifest.toml @@ -174,9 +174,11 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SplittablesBase]] deps = ["Setfield", "Test"] -git-tree-sha1 = "1f03a587a9cab12d41056cc65d0d871f5922bbd6" +git-tree-sha1 = "dde71ddb7a3e3d5ed01370f04d53a749f46ddf45" +repo-rev = "master" +repo-url = "https://github.com/JuliaFolds/SplittablesBase.jl.git" uuid = "171d559e-b47b-412a-8079-5efa626c420e" -version = "0.1.7" +version = "0.1.8-DEV" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] From d1ab8498d72070c973dd8d4dc20347f02e2f9e52 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 28 Jun 2020 01:32:15 -0700 Subject: [PATCH 3/3] Test foreach(f, referenceable(C), product(A, B)) --- test/test_foreach.jl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/test_foreach.jl b/test/test_foreach.jl index 1e6a0ce8..d2dc10b6 100644 --- a/test/test_foreach.jl +++ b/test/test_foreach.jl @@ -38,6 +38,18 @@ end ) @test C0 == C1 end + + @testset "foreach(f, referenceable(C), product(A, B))" begin + A = 1:3 + B = 1:2 + C = zeros(3, 2) + + ThreadsX.foreach(referenceable(C), Iterators.product(A, B)) do c, (a, b) + c[] = a * b + end + + @test C == A .* reshape(B, 1, :) + end end @testset "argument validation" begin