Merge changes from github.
PiperOrigin-RevId: 178185697
diff --git a/configure.py b/configure.py
index 99c0a8d..680448d 100644
--- a/configure.py
+++ b/configure.py
@@ -1090,6 +1090,28 @@
def set_trisycl_include_dir(environ_cp):
"""Set TRISYCL_INCLUDE_DIR."""
+ ask_trisycl_include_dir = ('Please specify the location of the triSYCL '
+ 'include directory. (Use --config=sycl_trisycl '
+ 'when building with Bazel) '
+ '[Default is %s]: ') % _DEFAULT_TRISYCL_INCLUDE_DIR
+ while True:
+ trisycl_include_dir = get_from_env_or_user_or_default(
+ environ_cp, 'TRISYCL_INCLUDE_DIR', ask_trisycl_include_dir,
+ _DEFAULT_TRISYCL_INCLUDE_DIR)
+ if os.path.exists(trisycl_include_dir):
+ break
+
+ print('Invalid triSYCL include directory, %s cannot be found'
+ % (trisycl_include_dir))
+
+ # Set TRISYCL_INCLUDE_DIR
+ environ_cp['TRISYCL_INCLUDE_DIR'] = trisycl_include_dir
+ write_action_env_to_bazelrc('TRISYCL_INCLUDE_DIR',
+ trisycl_include_dir)
+
+
+def set_trisycl_include_dir(environ_cp):
+ """Set TRISYCL_INCLUDE_DIR."""
trisycl_include_dir = prompt_loop_or_load_from_env(
environ_cp,