diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76f14c41d689454565269984080350b31fe579db..8a0cd956cb1a15f6484f9702d80fb0e169e4d379 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: REPO_DIR: gitlab.com/elixxir REPO_NAME: server DOCKER_IMAGE: elixxirlabs/cuda-go:latest - MIN_CODE_COVERAGE: "81.0" + MIN_CODE_COVERAGE: "50.0" before_script: ## diff --git a/go.mod b/go.mod index efb6f1a24510131666b0be4f28fe289ff49caa1e..b98d14941ceb3cd4458ac1a323cd45005797b929 100644 --- a/go.mod +++ b/go.mod @@ -23,11 +23,10 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.3 gitlab.com/elixxir/comms v0.0.0-20201007164918-8331c82e4f19 - gitlab.com/elixxir/crypto v0.0.0-20200929234850-a63eab712d94 - gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201007163558-0fea70f49fe0 + gitlab.com/elixxir/crypto v0.0.5 + gitlab.com/elixxir/gpumathsgo v0.0.3 gitlab.com/elixxir/primitives v0.0.0-20200929202834-811c810c6387 gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820 - gitlab.com/xx_network/crypto v0.0.0-20200806202113-978fa1984bbf // indirect golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de google.golang.org/grpc v1.31.0 gopkg.in/ini.v1 v1.55.0 // indirect diff --git a/go.sum b/go.sum index a1e3c909e68cc0932bc33ad8ccd110b0c0057b51..c950d809854f1dc47b7ba2878b60bbecdb9a6cb4 100644 --- a/go.sum +++ b/go.sum @@ -197,62 +197,29 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/zeebo/assert v0.0.0-20181109011804-10f827ce2ed6/go.mod h1:yssERNPivllc1yU3BvpjYI5BUW+zglcz6QWqeVRL5t0= -github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= -github.com/zeebo/blake3 v0.0.4/go.mod h1:YOZo8A49yNqM0X/Y+JmDUZshJWLt1laHsNSn5ny2i34= -github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm//LBaEvBiaXY7hXJ6KGe2V32X2F6E= gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23 h1:ikyf3DPibZq+SsVUeT6swPR53P9gjzfNzrKR172KNPg= gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY= -gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a h1:WsrvOH/UUkOImFg79R6O93b/ZR40KiyHNXKf2rSRXGk= -gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a/go.mod h1:L2Va13j2AbQkpkveOQmNzrQD37uI5NKeBhYH+LWMOx0= gitlab.com/elixxir/comms v0.0.0-20201007164918-8331c82e4f19 h1:g8KpUhsUPRppsGlN4F5/yJLpG/adxM6jb+4to4dGaWo= gitlab.com/elixxir/comms v0.0.0-20201007164918-8331c82e4f19/go.mod h1:kY0+AZPKkZMB+Dgvwj5cfqNE+OJjtbkxYj9hLhddN4A= -gitlab.com/elixxir/crypto v0.0.0-20200612160324-a76e4451ae25/go.mod h1:SpcmFZ4baOMRxH7qo2myvYFNr8/bz9ItYzVo5Q2Ld1k= gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 h1:9qzfwyR12OYgn3j30qcHZHHVfWshWnH54lcAHppEROQ= gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME= gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a h1:peZpulfSqLSceA5ovtzQ5MPgQt4YbJY8FzpV2S2Nrhc= gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME= -gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= -gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ= -gitlab.com/elixxir/crypto v0.0.0-20200929201533-f18c8bfec2a3 h1:5BzPvWqsjHzDXsSchXHPVH5zY2Ewusx/fgYJkPNtirk= -gitlab.com/elixxir/crypto v0.0.0-20200929201533-f18c8bfec2a3/go.mod h1:PFeyONfhulnM72O2wROslwhNadtnyvKAD2QLtQzAifM= -gitlab.com/elixxir/crypto v0.0.0-20200929230508-d362be55e7ac h1:UfyVuYTnTW/eGKK119k+IpnphjsvF8RTdZloK0r94Mk= -gitlab.com/elixxir/crypto v0.0.0-20200929230508-d362be55e7ac/go.mod h1:PFeyONfhulnM72O2wROslwhNadtnyvKAD2QLtQzAifM= gitlab.com/elixxir/crypto v0.0.0-20200929234850-a63eab712d94 h1:erhwVQzEFVlcsfJtN89rRAR0GRo7JhmlceiCA2mIyv4= gitlab.com/elixxir/crypto v0.0.0-20200929234850-a63eab712d94/go.mod h1:PFeyONfhulnM72O2wROslwhNadtnyvKAD2QLtQzAifM= -gitlab.com/elixxir/crypto v0.0.0-20201002151041-c4ab8f8033dc h1:Eg/f19rGUT8xEmvJ78DB4WXSS9OP+VWXjh/gVimIYNA= -gitlab.com/elixxir/crypto v0.0.0-20201002151041-c4ab8f8033dc/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20200617001921-1de1fff56304 h1:pK9IXv2s7YZX+dGc6UfIWGrDTQjP4kHpGEo0siL/4cQ= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20200617001921-1de1fff56304/go.mod h1:PymVIFnQSHltaQqwjUTbvSnT9FNViO3XkuNiP9m65vM= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201001212319-e5e5794e81ef h1:hrNi2NqazA2IAeF9sq+EcqMnFBebegBwrLaz8pBJezQ= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201001212319-e5e5794e81ef/go.mod h1:Xzg3HHVorqlJeQTpajlKpFN4VNKGAp2eORGck9NtyEc= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201002184945-6117de9a219e h1:EF+E6g9/7IymH4pz20kaoK8Oua44n/AYtifbSHBzQHo= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201002184945-6117de9a219e/go.mod h1:Xzg3HHVorqlJeQTpajlKpFN4VNKGAp2eORGck9NtyEc= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201002224936-10c0009b7bdd h1:oA7/PmaCVQlxYqWtPpN1JN8rNp+DiIzXPBFuSoVQnoI= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201002224936-10c0009b7bdd/go.mod h1:Xzg3HHVorqlJeQTpajlKpFN4VNKGAp2eORGck9NtyEc= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201007163558-0fea70f49fe0 h1:blqjf4He46aA1zfrnPrYl6N+pAet05bPwmqvRfZ6xZI= -gitlab.com/elixxir/gpumathsgo v0.0.2-0.20201007163558-0fea70f49fe0/go.mod h1:vUk8KpHenphHQgPszZcdyGDgd4/nEuqD7elXSynZUuM= -gitlab.com/elixxir/primitives v0.0.0-20200608222556-1d2c04e59346/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= +gitlab.com/elixxir/crypto v0.0.5 h1:QS/3PEA6Hni61r6YAV8IfneKydtZjcC5E4ZLUPrEypc= +gitlab.com/elixxir/crypto v0.0.5/go.mod h1:PFeyONfhulnM72O2wROslwhNadtnyvKAD2QLtQzAifM= +gitlab.com/elixxir/gpumathsgo v0.0.3 h1:LqJpuX5iStyfjduxykSrH2Sx58yJktmsHriNG1dghoU= +gitlab.com/elixxir/gpumathsgo v0.0.3/go.mod h1:vUk8KpHenphHQgPszZcdyGDgd4/nEuqD7elXSynZUuM= gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 h1:GTfflZBNLeBq3UApYog0J3+hytdkoRsDduGQji2wyEU= gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6 h1:7xLD8w5qAKN1YqG2UiMiN3rODUACyQME83uDlVhvWLo= gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= -gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= -gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0VelQda72OzoUckr1O+vPW0AiFe0nyKQ6gYcmFSuF8= -gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= -gitlab.com/elixxir/primitives v0.0.0-20200804231232-ad79a9e8f113/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= -gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= gitlab.com/elixxir/primitives v0.0.0-20200929195204-dd3970d93573/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= gitlab.com/elixxir/primitives v0.0.0-20200929202834-811c810c6387 h1:fYq0BEh1ksZVSqLkb0L+G3j8mUbQ9AsFSLEOsF1+11Q= gitlab.com/elixxir/primitives v0.0.0-20200929202834-811c810c6387/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= -gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820 h1:vdozJQgrnznmHJLS38aOXprLKZXClnHJ9ljY/70aWuI= gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820/go.mod h1:J+GJ6fn71a4xnYVvbcrhtvWSOQIqqhaGcaej5xB3/JY= -gitlab.com/xx_network/crypto v0.0.0-20200806202113-978fa1984bbf h1:MuVrOLxQkHqZJhj5VAHVbf1WoJVt1JDiJt7JwR+KD7A= -gitlab.com/xx_network/crypto v0.0.0-20200806202113-978fa1984bbf/go.mod h1:i0df/q6dDCBiscgD51fMoS2U2TBrm6LcyN822JmB5Tw= -gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA= -gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da h1:CCVslUwNC7Ul7NG5nu3ThGTSVUt1TxNRX+47f5TUwnk= -gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= @@ -296,7 +263,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/multiInstance_test.go b/multiInstance_test.go index 53f7fc0c4a5d335a6e2af806420b732ab2e321f6..ca6c66cd1790d358b4e3fa237ebd08a954fddd8c 100644 --- a/multiInstance_test.go +++ b/multiInstance_test.go @@ -73,7 +73,7 @@ func Test_MultiInstance_N3_B32_GPU(t *testing.T) { } viper.Set("useGpu", true) - elapsed := MultiInstanceTest(3, batchSize, makeMultiInstanceGroup4k(), true, false, t) + elapsed := MultiInstanceTest(3, batchSize, makeMultiInstanceGroup(), true, false, t) t.Logf("Computational elapsed time for 3 Node, batch size %d, GPU multi-"+ "instance test: %s", cmd.BatchSizeGPUTest, elapsed)