Bump TF to 2.4.0rc3, and enable TF C API logging (#1206)

* Bump TF to 2.4.0rc3, and enable TF C API logging

This PR bumps TF to 2.4.0rc3, and enable TF C API logging

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Add `bash -x -e tests/test_pulsar/pulsar_test.sh` in kokoro setup

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

Author: yongtang

.kokorun/io_cpu.sh

@@ -73,6 +73,7 @@ ls wheelhouse/*
 ## Set test services
 bash -x -e tests/test_gcloud/test_gcs.sh gcs-emulator
 bash -x -e tests/test_kafka/kafka_test.sh
+bash -x -e tests/test_pulsar/pulsar_test.sh
 bash -x -e tests/test_aws/aws_test.sh
 bash -x -e tests/test_pubsub/pubsub_test.sh pubsub
 bash -x -e tests/test_prometheus/prometheus_test.sh start

tensorflow_io/core/plugins/az/az_file_system.cc

@@ -31,11 +31,7 @@ limitations under the License.
 #include "storage_account.h"
 #include "storage_credential.h"
 #include "storage_errno.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
+#include "tensorflow/c/logging.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow_io/core/plugins/file_system_plugins.h"
 

tensorflow_io/core/plugins/gs/gcs_env.cc

@@ -28,12 +28,8 @@ limitations under the License.
 #endif
 #include <string>
 #include <vector>
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
 
+#include "tensorflow/c/logging.h"
 #include "tensorflow_io/core/plugins/gs/gcs_env.h"
 
 namespace tensorflow {

tensorflow_io/core/plugins/gs/gcs_filesystem.cc

@@ -20,16 +20,12 @@ limitations under the License.
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
 #include "google/cloud/storage/client.h"
+#include "tensorflow/c/logging.h"
+#include "tensorflow/c/tf_status.h"
 #include "tensorflow_io/core/plugins/file_system_plugins.h"
 #include "tensorflow_io/core/plugins/gs/expiring_lru_cache.h"
 #include "tensorflow_io/core/plugins/gs/gcs_helper.h"
 #include "tensorflow_io/core/plugins/gs/ram_file_block_cache.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
-#include "tensorflow/c/tf_status.h"
 
 namespace tensorflow {
 namespace io {

tensorflow_io/core/plugins/gs/ram_file_block_cache.h

@@ -27,12 +27,8 @@ limitations under the License.
 #include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/synchronization/notification.h"
+#include "tensorflow/c/logging.h"
 #include "tensorflow/c/tf_status.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
 #include "tensorflow_io/core/plugins/gs/gcs_env.h"
 
 namespace tensorflow {

tensorflow_io/core/plugins/hdfs/hadoop_filesystem.cc

@@ -31,11 +31,7 @@ limitations under the License.
 #include "absl/strings/str_cat.h"
 #include "absl/synchronization/mutex.h"
 #include "hdfs/hdfs.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
+#include "tensorflow/c/logging.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow_io/core/plugins/file_system_plugins.h"
 

tensorflow_io/core/plugins/http/http_file_system.cc

@@ -22,11 +22,7 @@ limitations under the License.
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/synchronization/mutex.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
+#include "tensorflow/c/logging.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow_io/core/plugins/file_system_plugins.h"
 

tensorflow_io/core/plugins/s3/aws_logging.cc

@@ -23,11 +23,7 @@ limitations under the License.
 #include <sstream>
 
 #include "absl/synchronization/mutex.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
+#include "tensorflow/c/logging.h"
 
 namespace tensorflow {
 namespace io {

tensorflow_io/core/plugins/s3/s3_filesystem.cc

@@ -36,15 +36,11 @@ limitations under the License.
 #include "absl/strings/ascii.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
+#include "tensorflow/c/logging.h"
+#include "tensorflow/c/tf_status.h"
 #include "tensorflow_io/core/plugins/file_system_plugins.h"
 #include "tensorflow_io/core/plugins/s3/aws_crypto.h"
 #include "tensorflow_io/core/plugins/s3/aws_logging.h"
-// TODO: Restore logging.h
-#define TF_Log(...)
-#define TF_VLog(...)
-// #include "tensorflow/c/logging.h"
-// TODO: Restore logging.h
-#include "tensorflow/c/tf_status.h"
 
 namespace tensorflow {
 namespace io {

tensorflow_io/core/python/ops/version_ops.py

@@ -14,5 +14,5 @@
 # ==============================================================================
 """version_ops"""
 
-package = "tensorflow>=2.4.0rc2,<2.5.0"
+package = "tensorflow>=2.4.0rc3,<2.5.0"
 version = "0.17.0"