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

Make use of GetDataDependencyFilepath and JoinPath to build paths which will

Browse Source 
work across operating systems.

The previous implementation doesn't work correctly on Windows.

PiperOrigin-RevId: 296295721
Change-Id: I1d4d067a5c938cfd6c1ce8724bb9f49ea89a4bda
This commit is contained in:
Brian Atkinson 2020-02-20 14:19:06 -08:00 committed by TensorFlower Gardener
parent 006060f423
commit 554f16e970
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/cc/saved_model/BUILD
View File

@ -68,6 +68,7 @@ tf_cc_test(
"//tensorflow/core:test", "//tensorflow/core:test",
"//tensorflow/core:test_main", "//tensorflow/core:test_main",
"//tensorflow/core:testlib", "//tensorflow/core:testlib",
"//tensorflow/core/platform:resource_loader",
], ],
) )

30
tensorflow/cc/saved_model/reader_test.cc
View File

@ -21,15 +21,22 @@ limitations under the License.
#include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/core/status_test_util.h"
#include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/io/path.h"
#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/str_util.h"
#include "tensorflow/core/platform/path.h"
#include "tensorflow/core/platform/resource_loader.h"
#include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test.h"
namespace tensorflow { namespace tensorflow {
namespace { namespace {
constexpr char kTestDataPbTxt[] = string TestDataPbTxt() {
"cc/saved_model/testdata/half_plus_two_pbtxt/00000123"; return io::JoinPath("tensorflow", "cc", "saved_model", "testdata",
constexpr char kTestDataSharded[] = "half_plus_two_pbtxt", "00000123");
"cc/saved_model/testdata/half_plus_two/00000123"; }
string TestDataSharded() {
return io::JoinPath("tensorflow", "cc", "saved_model", "testdata",
"half_plus_two", "00000123");
}
class ReaderTest : public ::testing::Test { class ReaderTest : public ::testing::Test {
protected: protected:
@ -49,8 +56,7 @@ class ReaderTest : public ::testing::Test {
TEST_F(ReaderTest, TagMatch) { TEST_F(ReaderTest, TagMatch) {
MetaGraphDef meta_graph_def; MetaGraphDef meta_graph_def;
const string export_dir = const string export_dir = GetDataDependencyFilepath(TestDataSharded());
io::JoinPath(testing::TensorFlowSrcRoot(), kTestDataSharded);
TF_ASSERT_OK(ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe}, TF_ASSERT_OK(ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe},
&meta_graph_def)); &meta_graph_def));
CheckMetaGraphDef(meta_graph_def); CheckMetaGraphDef(meta_graph_def);
@ -59,8 +65,7 @@ TEST_F(ReaderTest, TagMatch) {
TEST_F(ReaderTest, NoTagMatch) { TEST_F(ReaderTest, NoTagMatch) {
MetaGraphDef meta_graph_def; MetaGraphDef meta_graph_def;
const string export_dir = const string export_dir = GetDataDependencyFilepath(TestDataSharded());
io::JoinPath(testing::TensorFlowSrcRoot(), kTestDataSharded);
Status st = ReadMetaGraphDefFromSavedModel(export_dir, {"missing-tag"}, Status st = ReadMetaGraphDefFromSavedModel(export_dir, {"missing-tag"},
&meta_graph_def); &meta_graph_def);
EXPECT_FALSE(st.ok()); EXPECT_FALSE(st.ok());
@ -73,8 +78,7 @@ TEST_F(ReaderTest, NoTagMatch) {
TEST_F(ReaderTest, NoTagMatchMultiple) { TEST_F(ReaderTest, NoTagMatchMultiple) {
MetaGraphDef meta_graph_def; MetaGraphDef meta_graph_def;
const string export_dir = const string export_dir = GetDataDependencyFilepath(TestDataSharded());
io::JoinPath(testing::TensorFlowSrcRoot(), kTestDataSharded);
Status st = ReadMetaGraphDefFromSavedModel( Status st = ReadMetaGraphDefFromSavedModel(
export_dir, {kSavedModelTagServe, "missing-tag"}, &meta_graph_def); export_dir, {kSavedModelTagServe, "missing-tag"}, &meta_graph_def);
EXPECT_FALSE(st.ok()); EXPECT_FALSE(st.ok());
@ -87,8 +91,7 @@ TEST_F(ReaderTest, NoTagMatchMultiple) {
TEST_F(ReaderTest, PbtxtFormat) { TEST_F(ReaderTest, PbtxtFormat) {
MetaGraphDef meta_graph_def; MetaGraphDef meta_graph_def;
const string export_dir = const string export_dir = GetDataDependencyFilepath(TestDataPbTxt());
io::JoinPath(testing::TensorFlowSrcRoot(), kTestDataPbTxt);
TF_ASSERT_OK(ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe}, TF_ASSERT_OK(ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe},
&meta_graph_def)); &meta_graph_def));
CheckMetaGraphDef(meta_graph_def); CheckMetaGraphDef(meta_graph_def);
@ -97,8 +100,7 @@ TEST_F(ReaderTest, PbtxtFormat) {
TEST_F(ReaderTest, InvalidExportPath) { TEST_F(ReaderTest, InvalidExportPath) {
MetaGraphDef meta_graph_def; MetaGraphDef meta_graph_def;
const string export_dir = const string export_dir = GetDataDependencyFilepath("missing-path");
io::JoinPath(testing::TensorFlowSrcRoot(), "missing-path");
Status st = ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe}, Status st = ReadMetaGraphDefFromSavedModel(export_dir, {kSavedModelTagServe},
&meta_graph_def); &meta_graph_def);
EXPECT_FALSE(st.ok()); EXPECT_FALSE(st.ok());