tensorflow · nkreeger · Apr 4, 2018 · nkreeger · Apr 4, 2018 · nkreeger
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
-void CopyTensorJSBuffer(napi_env env, napi_value wrapped_value, int64_t* shape,
-                        uint32_t shape_length, TF_DataType dtype,
-                        napi_value typed_array_value) {
+void CreateTFE_TensorHandleFromTypedArray(
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
+  // OpAttr will be used beyond the scope of this function call. Stash ops in a
+  // set for re-use instead of dynamically reallocating strings for operations.
+  const char* attr_name;
+  auto result = ATTR_NAME_SET.find(attr_name_string);
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
+  if (result == ATTR_NAME_SET.end()) {
+    auto insert_result = ATTR_NAME_SET.insert(std::string(attr_name_string));
+    // TODO assert success?
+    result = insert_result.first;
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
+
+  TF_AttrType tf_attr_type;
+  nstatus = napi_get_value_int32(env, attr_type_value,
+                                 reinterpret_cast<int32_t*>(&tf_attr_type));
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
+  switch (tf_attr_type) {
+    case TF_ATTR_STRING: {
+      char value[NAPI_STRING_SIZE];
+      nstatus = napi_get_value_string_utf8(env, type_input_value, value,
diff --git a/binding/tfjs_backend.cc b/binding/tfjs_backend.cc
+  }
+
+  TFE_DeleteTensorHandle(tensor_entry->second);
+  tfe_handle_map->erase(tensor_id);
diff --git a/binding/tfjs_backend.cc b/binding/tfjs_backend.cc
+  ENSURE_NAPI_OK_RETVAL(env, nstatus, nullptr);
+
+  // Push `nullptr` to get a valid pointer in the call to `TFE_Execute()` below.
+  std::vector<TFE_TensorHandle*> result_handles;
diff --git a/binding/tfjs_backend.cc b/binding/tfjs_backend.cc
+    napi_value shape_value;
+    GetTFE_TensorHandleShape(env, handle, &shape_value);
+
+    nstatus =
diff --git a/binding/tfjs_backend.h b/binding/tfjs_backend.h
+ private:
+  TFE_Context* tfe_context;
+  std::map<int32_t, TFE_TensorHandle*>* tfe_handle_map;
+  int32_t tensor_index;
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
@@ -246,21 +206,12 @@ void GetTensorData(napi_env env, napi_value context_value,
  }
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
@@ -258,13 +259,13 @@ void AssignOpAttr(napi_env env, TFE_Op* tfe_op, napi_value attr_value) {
  // OpAttr will be used beyond the scope of this function call. Stash ops in a
  // set for re-use instead of dynamically reallocating strings for operations.
  const char* attr_name;
-  auto result = ATTR_NAME_SET.find(attr_name_string);
+  std::string attr_name_str(attr_name_string);
+  auto result = ATTR_NAME_SET.find(attr_name_str);
diff --git a/binding/tfe_utils.cc b/binding/tfe_utils.cc
+  switch (tf_attr_type) {
+    case TF_ATTR_STRING: {
+      char value[NAPI_STRING_SIZE];
+      nstatus = napi_get_value_string_utf8(env, type_input_value, value,
diff --git a/binding/tfjs_backend.cc b/binding/tfjs_backend.cc
-  tfe_handle_map->insert(pair);
+  auto pair =
+      std::pair<int32_t, TFE_TensorHandle*>(next_tensor_id_++, tfe_handle);
+  tfe_handle_map_.insert(pair);
diff --git a/binding/tfjs_backend.cc b/binding/tfjs_backend.cc

-  tfe_handle_map = new std::map<int32_t, TFE_TensorHandle*>();
+TFJSBackend::~TFJSBackend() {
+  for (auto iter = tfe_handle_map_.begin(); iter != tfe_handle_map_.end();
diff --git a/binding/tfjs_backend.h b/binding/tfjs_backend.h
@@ -26,36 +26,43 @@ namespace tfnodejs {

 class TFJSBackend {
 public:
-  TFJSBackend();
+  // TODO(kreeger): Move to a factory and make this private.
+  TFJSBackend(napi_env env);
  virtual ~TFJSBackend();
		@@ -246,21 +206,12 @@ void GetTensorData(napi_env env, napi_value context_value,
		}