experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move contrib/tensorboard/db to new core/summary directory

Browse Source 
PiperOrigin-RevId: 228213314
This commit is contained in:
Nick Felt 2019-01-07 12:23:54 -08:00 committed by TensorFlower Gardener
parent 7ba04bba51
commit 021a8fe8a7
17 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tensorflow/contrib/cmake/tf_core_framework.cmake
View File

@ -302,8 +302,8 @@ file(GLOB_RECURSE tf_core_framework_srcs
"${tensorflow_source_dir}/tensorflow/core/common_runtime/session.cc" "${tensorflow_source_dir}/tensorflow/core/common_runtime/session.cc"
"${tensorflow_source_dir}/tensorflow/core/common_runtime/session_factory.cc" "${tensorflow_source_dir}/tensorflow/core/common_runtime/session_factory.cc"
"${tensorflow_source_dir}/tensorflow/core/common_runtime/session_options.cc" "${tensorflow_source_dir}/tensorflow/core/common_runtime/session_options.cc"
"${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/*.cc" "${tensorflow_source_dir}/tensorflow/core/summary/*.cc"
"${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/*.h" "${tensorflow_source_dir}/tensorflow/core/summary/*.h"
"${tensorflow_source_dir}/public/*.h" "${tensorflow_source_dir}/public/*.h"
) )
@ -317,14 +317,14 @@ file(GLOB_RECURSE tf_core_framework_exclude_srcs
"${tensorflow_source_dir}/tensorflow/core/util/*test*.h" "${tensorflow_source_dir}/tensorflow/core/util/*test*.h"
"${tensorflow_source_dir}/tensorflow/core/util/*test*.cc" "${tensorflow_source_dir}/tensorflow/core/util/*test*.cc"
"${tensorflow_source_dir}/tensorflow/core/util/*main.cc" "${tensorflow_source_dir}/tensorflow/core/util/*main.cc"
"${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/*test*.cc" "${tensorflow_source_dir}/tensorflow/core/summary/*test*.cc"
"${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/loader.cc" "${tensorflow_source_dir}/tensorflow/core/summary/loader.cc"
"${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/vacuum.cc" "${tensorflow_source_dir}/tensorflow/core/summary/vacuum.cc"
) )
# TODO(jart): Why doesn't this work? # TODO(jart): Why doesn't this work?
# set_source_files_properties( # set_source_files_properties(
# ${tensorflow_source_dir}/tensorflow/contrib/tensorboard/db/snapfn.cc # ${tensorflow_source_dir}/tensorflow/core/lib/db/snapfn.cc
# PROPERTIES COMPILE_FLAGS -DSQLITE_OMIT_LOAD_EXTENSION) # PROPERTIES COMPILE_FLAGS -DSQLITE_OMIT_LOAD_EXTENSION)
list(REMOVE_ITEM tf_core_framework_srcs ${tf_core_framework_exclude_srcs}) list(REMOVE_ITEM tf_core_framework_srcs ${tf_core_framework_exclude_srcs})

10
tensorflow/core/kernels/BUILD
View File

@ -31,7 +31,6 @@ load(
"//tensorflow:tensorflow.bzl", "//tensorflow:tensorflow.bzl",
"cc_header_only_library", "cc_header_only_library",
"if_android", "if_android",
"if_not_v2",
"if_not_windows", "if_not_windows",
"tf_cc_binary", "tf_cc_binary",
"tf_cc_test", "tf_cc_test",
@ -6888,11 +6887,10 @@ tf_kernel_library(
"//tensorflow/core:protos_all_cc", "//tensorflow/core:protos_all_cc",
"//tensorflow/core:summary_ops_op_lib", "//tensorflow/core:summary_ops_op_lib",
"//tensorflow/core/lib/db:sqlite", "//tensorflow/core/lib/db:sqlite",
] + if_not_v2([ "//tensorflow/core/summary:schema",
"//tensorflow/contrib/tensorboard/db:schema", "//tensorflow/core/summary:summary_db_writer",
"//tensorflow/contrib/tensorboard/db:summary_db_writer", "//tensorflow/core/summary:summary_file_writer",
"//tensorflow/contrib/tensorboard/db:summary_file_writer", ],
]),
) )
tf_kernel_library( tf_kernel_library(

6
tensorflow/core/kernels/summary_kernels.cc
View File

@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/schema.h"
#include "tensorflow/contrib/tensorboard/db/summary_db_writer.h"
#include "tensorflow/contrib/tensorboard/db/summary_file_writer.h"
#include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/resource_mgr.h" #include "tensorflow/core/framework/resource_mgr.h"
#include "tensorflow/core/lib/db/sqlite.h" #include "tensorflow/core/lib/db/sqlite.h"
#include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/protobuf.h"
#include "tensorflow/core/summary/schema.h"
#include "tensorflow/core/summary/summary_db_writer.h"
#include "tensorflow/core/summary/summary_file_writer.h"
#include "tensorflow/core/util/event.pb.h" #include "tensorflow/core/util/event.pb.h"
namespace tensorflow { namespace tensorflow {

2
tensorflow/contrib/tensorboard/db/BUILD → tensorflow/core/summary/BUILD
View File

@ -1,5 +1,5 @@
# Description: # Description:
# TensorBoard database code. # C++ implementation code for the summary writing APIs.
package(default_visibility = ["//tensorflow:internal"]) package(default_visibility = ["//tensorflow:internal"])

4
tensorflow/contrib/tensorboard/db/loader.cc → tensorflow/core/summary/loader.cc
View File

@ -15,8 +15,8 @@ limitations under the License.
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "tensorflow/contrib/tensorboard/db/schema.h" #include "tensorflow/core/summary/schema.h"
#include "tensorflow/contrib/tensorboard/db/summary_db_writer.h" #include "tensorflow/core/summary/summary_db_writer.h"
#include "tensorflow/core/lib/db/sqlite.h" #include "tensorflow/core/lib/db/sqlite.h"
#include "tensorflow/core/lib/io/record_reader.h" #include "tensorflow/core/lib/io/record_reader.h"
#include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/platform/init_main.h"

2
tensorflow/contrib/tensorboard/db/schema.cc → tensorflow/core/summary/schema.cc
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/schema.h" #include "tensorflow/core/summary/schema.h"
#include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/errors.h"

6
tensorflow/contrib/tensorboard/db/schema.h → tensorflow/core/summary/schema.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#ifndef TENSORFLOW_CONTRIB_TENSORBOARD_DB_SCHEMA_H_ #ifndef TENSORFLOW_CORE_SUMMARY_SCHEMA_H_
#define TENSORFLOW_CONTRIB_TENSORBOARD_DB_SCHEMA_H_ #define TENSORFLOW_CORE_SUMMARY_SCHEMA_H_
#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/lib/db/sqlite.h" #include "tensorflow/core/lib/db/sqlite.h"
@ -30,4 +30,4 @@ Status SetupTensorboardSqliteDb(Sqlite* db);
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CONTRIB_TENSORBOARD_DB_SCHEMA_H_ #endif // TENSORFLOW_CORE_SUMMARY_SCHEMA_H_

2
tensorflow/contrib/tensorboard/db/schema_test.cc → tensorflow/core/summary/schema_test.cc
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/schema.h" #include "tensorflow/core/summary/schema.h"
#include <memory> #include <memory>

2
tensorflow/contrib/tensorboard/db/summary_converter.cc → tensorflow/core/summary/summary_converter.cc
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/summary_converter.h" #include "tensorflow/core/summary/summary_converter.h"
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/framework/summary.pb.h"

6
tensorflow/contrib/tensorboard/db/summary_converter.h → tensorflow/core/summary/summary_converter.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#ifndef TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_CONVERTER_H_ #ifndef TENSORFLOW_CORE_SUMMARY_SUMMARY_CONVERTER_H_
#define TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_CONVERTER_H_ #define TENSORFLOW_CORE_SUMMARY_SUMMARY_CONVERTER_H_
#include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/framework/summary.pb.h"
#include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor.h"
@ -35,4 +35,4 @@ Status AddTensorAsAudioToSummary(const Tensor& tensor, const string& tag,
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_CONVERTER_H_ #endif // TENSORFLOW_CORE_SUMMARY_SUMMARY_CONVERTER_H_

4
tensorflow/contrib/tensorboard/db/summary_db_writer.cc → tensorflow/core/summary/summary_db_writer.cc
View File

@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/summary_db_writer.h" #include "tensorflow/core/summary/summary_db_writer.h"
#include <deque> #include <deque>
#include "tensorflow/contrib/tensorboard/db/summary_converter.h" #include "tensorflow/core/summary/summary_converter.h"
#include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def.pb.h" #include "tensorflow/core/framework/node_def.pb.h"
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"

6
tensorflow/contrib/tensorboard/db/summary_db_writer.h → tensorflow/core/summary/summary_db_writer.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#ifndef TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_DB_WRITER_H_ #ifndef TENSORFLOW_CORE_SUMMARY_SUMMARY_DB_WRITER_H_
#define TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_DB_WRITER_H_ #define TENSORFLOW_CORE_SUMMARY_SUMMARY_DB_WRITER_H_
#include "tensorflow/core/kernels/summary_interface.h" #include "tensorflow/core/kernels/summary_interface.h"
#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status.h"
@ -39,4 +39,4 @@ Status CreateSummaryDbWriter(Sqlite* db, const string& experiment_name,
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_DB_WRITER_H_ #endif // TENSORFLOW_CORE_SUMMARY_SUMMARY_DB_WRITER_H_

4
tensorflow/contrib/tensorboard/db/summary_db_writer_test.cc → tensorflow/core/summary/summary_db_writer_test.cc
View File

@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/summary_db_writer.h" #include "tensorflow/core/summary/summary_db_writer.h"
#include "tensorflow/contrib/tensorboard/db/schema.h" #include "tensorflow/core/summary/schema.h"
#include "tensorflow/core/framework/function.pb.h" #include "tensorflow/core/framework/function.pb.h"
#include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/node_def.pb.h" #include "tensorflow/core/framework/node_def.pb.h"

4
tensorflow/contrib/tensorboard/db/summary_file_writer.cc → tensorflow/core/summary/summary_file_writer.cc
View File

@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/summary_file_writer.h" #include "tensorflow/core/summary/summary_file_writer.h"
#include "tensorflow/contrib/tensorboard/db/summary_converter.h" #include "tensorflow/core/summary/summary_converter.h"
#include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/graph.pb.h"
#include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/resource_mgr.h" #include "tensorflow/core/framework/resource_mgr.h"

6
tensorflow/contrib/tensorboard/db/summary_file_writer.h → tensorflow/core/summary/summary_file_writer.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#ifndef TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_FILE_WRITER_H_ #ifndef TENSORFLOW_CORE_SUMMARY_SUMMARY_FILE_WRITER_H_
#define TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_FILE_WRITER_H_ #define TENSORFLOW_CORE_SUMMARY_SUMMARY_FILE_WRITER_H_
#include "tensorflow/core/kernels/summary_interface.h" #include "tensorflow/core/kernels/summary_interface.h"
#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status.h"
@ -40,4 +40,4 @@ Status CreateSummaryFileWriter(int max_queue, int flush_millis,
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CONTRIB_TENSORBOARD_DB_SUMMARY_FILE_WRITER_H_ #endif // TENSORFLOW_CORE_SUMMARY_SUMMARY_FILE_WRITER_H_

2
tensorflow/contrib/tensorboard/db/summary_file_writer_test.cc → tensorflow/core/summary/summary_file_writer_test.cc
View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==============================================================================*/ ==============================================================================*/
#include "tensorflow/contrib/tensorboard/db/summary_file_writer.h" #include "tensorflow/core/summary/summary_file_writer.h"
#include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/framework/summary.pb.h"
#include "tensorflow/core/framework/tensor.pb.h" #include "tensorflow/core/framework/tensor.pb.h"

0
tensorflow/contrib/tensorboard/db/vacuum.cc → tensorflow/core/summary/vacuum.cc
View File