From d9f60489551202768696507faf67e09d98881ad4 Mon Sep 17 00:00:00 2001
From: Kai Huang <huangkaivision@gmail.com>
Date: Mon, 10 Aug 2020 18:27:29 +0800
Subject: [PATCH] Add init_spark_standalone for local node (#2685)

* initial version

* remove

* update to local

* remove

* style

* fix path

* fix

* update pythonhome
---
 python/orca/src/bigdl/orca/ray/raycontext.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/python/orca/src/bigdl/orca/ray/raycontext.py b/python/orca/src/bigdl/orca/ray/raycontext.py
index d7f8f6836cb..76492658868 100755
--- a/python/orca/src/bigdl/orca/ray/raycontext.py
+++ b/python/orca/src/bigdl/orca/ray/raycontext.py
@@ -55,9 +55,19 @@ class RayServiceFuncGenerator(object):
     """
     def _prepare_env(self):
         modified_env = os.environ.copy()
-        cwd = os.getcwd()
-        modified_env["PATH"] = "{}/{}:{}".format(cwd, "/".join(self.python_loc.split("/")[:-1]),
-                                                 os.environ["PATH"])
+        if self.python_loc == "python_env/bin/python":
+            # In this case the executor is using the conda yarn archive under the current
+            # working directory. Need to get the full path.
+            executor_python_path = "{}/{}".format(
+                os.getcwd(), "/".join(self.python_loc.split("/")[:-1]))
+        else:
+            executor_python_path = "/".join(self.python_loc.split("/")[:-1])
+        if "PATH" in os.environ:
+            modified_env["PATH"] = "{}:{}".format(executor_python_path, os.environ["PATH"])
+        else:
+            modified_env["PATH"] = executor_python_path
+        modified_env["LC_ALL"] = "C.UTF-8"
+        modified_env["LANG"] = "C.UTF-8"
         modified_env.pop("MALLOC_ARENA_MAX", None)
         modified_env.pop("RAY_BACKEND_LOG_LEVEL", None)
         # Unset all MKL setting as Analytics Zoo would give default values when init env.
@@ -95,7 +105,7 @@ def __init__(self, python_loc, redis_port, ray_node_cpu_cores,
         # This is useful to allocate workers and servers in the cluster.
         # Leave some reserved custom resources free to avoid unknown crash due to resources.
         self.labels = \
-            """--resources='{"_mxnet_worker": %s, "_mxnet_server": %s, "_reserved": %s}' """ \
+            """--resources '{"_mxnet_worker": %s, "_mxnet_server": %s, "_reserved": %s}'""" \
             % (1, 1, 2)
 
     def gen_stop(self):