From 30b6103ffee851c99d0b50cecdc001f03b732d9c Mon Sep 17 00:00:00 2001 From: Shigeki Karita Date: Sat, 16 May 2020 01:52:37 +0900 Subject: [PATCH] reorganize packages again --- README.md | 1 + deimos/dub.json | 4 ++ deimos/{ => source}/tfd/c_api/linux.d | 0 deimos/{ => source}/tfd/c_api/linux.dpp | 0 deimos/{ => source}/tfd/c_api/package.d | 0 deimos/{ => source}/tfd/c_api/windows.d | 0 deimos/{ => source}/tfd/c_api/windows.dpp | 0 dub.json | 49 ++++++++-------------- example/graph_import/add-d.bin | Bin 135 -> 135 bytes example/graph_import/add-py.bin | Bin 164 -> 164 bytes {core/source => source}/tfd/graph.d | 0 {core/source => source}/tfd/package.d | 0 {core/source => source}/tfd/session.d | 0 {core/source => source}/tfd/tensor.d | 0 {core/source => source}/tfd/testing.d | 0 15 files changed, 23 insertions(+), 31 deletions(-) create mode 100644 deimos/dub.json rename deimos/{ => source}/tfd/c_api/linux.d (100%) rename deimos/{ => source}/tfd/c_api/linux.dpp (100%) rename deimos/{ => source}/tfd/c_api/package.d (100%) rename deimos/{ => source}/tfd/c_api/windows.d (100%) rename deimos/{ => source}/tfd/c_api/windows.dpp (100%) rename {core/source => source}/tfd/graph.d (100%) rename {core/source => source}/tfd/package.d (100%) rename {core/source => source}/tfd/session.d (100%) rename {core/source => source}/tfd/tensor.d (100%) rename {core/source => source}/tfd/testing.d (100%) diff --git a/README.md b/README.md index 0ee7d2d..856433b 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ And more: - [ ] Rewrite C API example with typed bindings. - [ ] Implement autograd, and simple training APIs in D. - [ ] Support cloud TPU. +- [ ] Support dip1000. ## Requirements diff --git a/deimos/dub.json b/deimos/dub.json new file mode 100644 index 0000000..23e70a6 --- /dev/null +++ b/deimos/dub.json @@ -0,0 +1,4 @@ +{ + "name": "deimos", + "targetType": "library" +} diff --git a/deimos/tfd/c_api/linux.d b/deimos/source/tfd/c_api/linux.d similarity index 100% rename from deimos/tfd/c_api/linux.d rename to deimos/source/tfd/c_api/linux.d diff --git a/deimos/tfd/c_api/linux.dpp b/deimos/source/tfd/c_api/linux.dpp similarity index 100% rename from deimos/tfd/c_api/linux.dpp rename to deimos/source/tfd/c_api/linux.dpp diff --git a/deimos/tfd/c_api/package.d b/deimos/source/tfd/c_api/package.d similarity index 100% rename from deimos/tfd/c_api/package.d rename to deimos/source/tfd/c_api/package.d diff --git a/deimos/tfd/c_api/windows.d b/deimos/source/tfd/c_api/windows.d similarity index 100% rename from deimos/tfd/c_api/windows.d rename to deimos/source/tfd/c_api/windows.d diff --git a/deimos/tfd/c_api/windows.dpp b/deimos/source/tfd/c_api/windows.dpp similarity index 100% rename from deimos/tfd/c_api/windows.dpp rename to deimos/source/tfd/c_api/windows.dpp diff --git a/dub.json b/dub.json index a56472e..526bbd3 100644 --- a/dub.json +++ b/dub.json @@ -6,39 +6,26 @@ "description": "TF for D", "license": "BSL-1.0", "name": "tfd", - "targetType": "none", "dependencies": { - "tfd:core": "*" + "tfd:deimos": "*" }, - "subPackages": [ - { - "name": "deimos", - "sourcePaths": ["deimos"], - "importPaths": ["deimos"] + "subPackages": ["deimos"], + "dependencies": { + "mir-algorithm": "~>3.7.28", + "tfd:deimos": "*" + }, + "buildTypes": { + "unittest": { + "libs": ["tensorflow"], + "buildOptions": ["unittests", "debugMode", "debugInfo"], + "versions": ["tfd_test"], + "dflags": ["-preview=dip1008"] }, - { - "name": "core", - "targetType": "library", - "sourcePaths": ["core/source"], - "importPaths": ["core/source"], - "dependencies": { - "mir-algorithm": "~>3.7.28", - "tfd:deimos": "*" - }, - "buildTypes": { - "unittest": { - "libs": ["tensorflow"], - "buildOptions": ["unittests", "debugMode", "debugInfo"], - "versions": ["tfd_test"], - "dflags": ["-preview=dip1008"] - }, - "unittest-cov": { - "libs": ["tensorflow"], - "buildOptions": ["unittests", "coverage", "debugMode", "debugInfo"], - "versions": ["tfd_test"], - "dflags": ["-preview=dip1008"] - } - } + "unittest-cov": { + "libs": ["tensorflow"], + "buildOptions": ["unittests", "coverage", "debugMode", "debugInfo"], + "versions": ["tfd_test"], + "dflags": ["-preview=dip1008"] } - ] + } } diff --git a/example/graph_import/add-d.bin b/example/graph_import/add-d.bin index f50e91d281c12965132030826a6f546d4a433452..69c9909b492bfec2dd33c46a074e64aa7bf95132 100644 GIT binary patch literal 135 zcmdOaK4? diff --git a/example/graph_import/add-py.bin b/example/graph_import/add-py.bin index 2e8c65ab23699d07c73b85269b751710069c4956..6f34f0dc279cd7dbe5056a66d10c7e0261eaf21f 100644 GIT binary patch delta 32 lcmZ3&xP)0sxOV2uuI~ delta 32 lcmZ3&xP)|lWkISClL509Hy3MhMk0t~#V}E)0sxQh2uuI~ diff --git a/core/source/tfd/graph.d b/source/tfd/graph.d similarity index 100% rename from core/source/tfd/graph.d rename to source/tfd/graph.d diff --git a/core/source/tfd/package.d b/source/tfd/package.d similarity index 100% rename from core/source/tfd/package.d rename to source/tfd/package.d diff --git a/core/source/tfd/session.d b/source/tfd/session.d similarity index 100% rename from core/source/tfd/session.d rename to source/tfd/session.d diff --git a/core/source/tfd/tensor.d b/source/tfd/tensor.d similarity index 100% rename from core/source/tfd/tensor.d rename to source/tfd/tensor.d diff --git a/core/source/tfd/testing.d b/source/tfd/testing.d similarity index 100% rename from core/source/tfd/testing.d rename to source/tfd/testing.d