From 7bd798177924206f24f3393b61afe55f7550edba Mon Sep 17 00:00:00 2001
From: Kei Okada <k-okada@jsk.t.u-tokyo.ac.jp>
Date: Fri, 9 Jul 2021 17:07:21 +0900
Subject: [PATCH] if we install cupy with pip install cupy, instead of pip
 install cupy-cudaXXX, the package name is cupy

---
 jsk_perception/node_scripts/alexnet_object_recognition.py     | 2 +-
 jsk_perception/node_scripts/deep_sort/deep_sort_tracker.py    | 2 +-
 jsk_perception/node_scripts/deep_sort_tracker_node.py         | 2 +-
 jsk_perception/node_scripts/face_pose_estimation.py           | 2 +-
 jsk_perception/node_scripts/fast_rcnn.py                      | 2 +-
 jsk_perception/node_scripts/fcn_depth_prediction.py           | 2 +-
 jsk_perception/node_scripts/fcn_object_segmentation.py        | 2 +-
 jsk_perception/node_scripts/hmr/net.py                        | 2 +-
 jsk_perception/node_scripts/hmr/resnet_v2_50.py               | 2 +-
 jsk_perception/node_scripts/hmr/smpl.py                       | 2 +-
 jsk_perception/node_scripts/human_mesh_recovery.py            | 2 +-
 .../node_scripts/mask_rcnn_instance_segmentation.py           | 2 +-
 jsk_perception/node_scripts/openpose/hand_net.py              | 2 +-
 jsk_perception/node_scripts/openpose/pose_net.py              | 2 +-
 jsk_perception/node_scripts/people_pose_estimation_2d.py      | 4 ++--
 .../node_scripts/regional_feature_based_object_recognition.py | 2 +-
 jsk_perception/node_scripts/ssd_object_detector.py            | 2 +-
 jsk_perception/node_scripts/vgg16_object_recognition.py       | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/jsk_perception/node_scripts/alexnet_object_recognition.py b/jsk_perception/node_scripts/alexnet_object_recognition.py
index 9653df0764..7722715d30 100755
--- a/jsk_perception/node_scripts/alexnet_object_recognition.py
+++ b/jsk_perception/node_scripts/alexnet_object_recognition.py
@@ -15,7 +15,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/deep_sort/deep_sort_tracker.py b/jsk_perception/node_scripts/deep_sort/deep_sort_tracker.py
index 24a4800f26..8babc8c4fb 100644
--- a/jsk_perception/node_scripts/deep_sort/deep_sort_tracker.py
+++ b/jsk_perception/node_scripts/deep_sort/deep_sort_tracker.py
@@ -13,7 +13,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/deep_sort_tracker_node.py b/jsk_perception/node_scripts/deep_sort_tracker_node.py
index ea4e8f2c6f..799c6bf047 100755
--- a/jsk_perception/node_scripts/deep_sort_tracker_node.py
+++ b/jsk_perception/node_scripts/deep_sort_tracker_node.py
@@ -15,7 +15,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/face_pose_estimation.py b/jsk_perception/node_scripts/face_pose_estimation.py
index 0e7090dea5..26348e7e55 100755
--- a/jsk_perception/node_scripts/face_pose_estimation.py
+++ b/jsk_perception/node_scripts/face_pose_estimation.py
@@ -20,7 +20,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/fast_rcnn.py b/jsk_perception/node_scripts/fast_rcnn.py
index 1a15bfc6cc..3f770b066e 100755
--- a/jsk_perception/node_scripts/fast_rcnn.py
+++ b/jsk_perception/node_scripts/fast_rcnn.py
@@ -16,7 +16,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/fcn_depth_prediction.py b/jsk_perception/node_scripts/fcn_depth_prediction.py
index f8cd95dcb4..6fc16ad5ae 100755
--- a/jsk_perception/node_scripts/fcn_depth_prediction.py
+++ b/jsk_perception/node_scripts/fcn_depth_prediction.py
@@ -14,7 +14,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/fcn_object_segmentation.py b/jsk_perception/node_scripts/fcn_object_segmentation.py
index 52ab653fa1..d5f40f93ef 100755
--- a/jsk_perception/node_scripts/fcn_object_segmentation.py
+++ b/jsk_perception/node_scripts/fcn_object_segmentation.py
@@ -14,7 +14,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/hmr/net.py b/jsk_perception/node_scripts/hmr/net.py
index 4114c9b513..e410e8d455 100644
--- a/jsk_perception/node_scripts/hmr/net.py
+++ b/jsk_perception/node_scripts/hmr/net.py
@@ -11,7 +11,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/hmr/resnet_v2_50.py b/jsk_perception/node_scripts/hmr/resnet_v2_50.py
index 05efc3bc10..a01af2063f 100644
--- a/jsk_perception/node_scripts/hmr/resnet_v2_50.py
+++ b/jsk_perception/node_scripts/hmr/resnet_v2_50.py
@@ -11,7 +11,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/hmr/smpl.py b/jsk_perception/node_scripts/hmr/smpl.py
index 2680385854..c3ea78be21 100644
--- a/jsk_perception/node_scripts/hmr/smpl.py
+++ b/jsk_perception/node_scripts/hmr/smpl.py
@@ -13,7 +13,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/human_mesh_recovery.py b/jsk_perception/node_scripts/human_mesh_recovery.py
index 7b8470d919..40601d1183 100755
--- a/jsk_perception/node_scripts/human_mesh_recovery.py
+++ b/jsk_perception/node_scripts/human_mesh_recovery.py
@@ -18,7 +18,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/mask_rcnn_instance_segmentation.py b/jsk_perception/node_scripts/mask_rcnn_instance_segmentation.py
index 7d5893e561..fa178a4b6b 100755
--- a/jsk_perception/node_scripts/mask_rcnn_instance_segmentation.py
+++ b/jsk_perception/node_scripts/mask_rcnn_instance_segmentation.py
@@ -16,7 +16,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/openpose/hand_net.py b/jsk_perception/node_scripts/openpose/hand_net.py
index bd32a44eed..10a0d658cd 100755
--- a/jsk_perception/node_scripts/openpose/hand_net.py
+++ b/jsk_perception/node_scripts/openpose/hand_net.py
@@ -18,7 +18,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/openpose/pose_net.py b/jsk_perception/node_scripts/openpose/pose_net.py
index 29c24d1b00..f108c60f70 100644
--- a/jsk_perception/node_scripts/openpose/pose_net.py
+++ b/jsk_perception/node_scripts/openpose/pose_net.py
@@ -12,7 +12,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/people_pose_estimation_2d.py b/jsk_perception/node_scripts/people_pose_estimation_2d.py
index b57dfa5ea6..9cda494c48 100755
--- a/jsk_perception/node_scripts/people_pose_estimation_2d.py
+++ b/jsk_perception/node_scripts/people_pose_estimation_2d.py
@@ -18,7 +18,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
    sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
    print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
@@ -26,7 +26,7 @@
     sudo pip install cupy-cuda91
 
 ''', file=sys.stderr)
-   sys.exit(1)
+   # sys.exit(1)
 import chainer
 import chainer.functions as F
 from chainer import cuda
diff --git a/jsk_perception/node_scripts/regional_feature_based_object_recognition.py b/jsk_perception/node_scripts/regional_feature_based_object_recognition.py
index b4791fe26b..0bebd48372 100755
--- a/jsk_perception/node_scripts/regional_feature_based_object_recognition.py
+++ b/jsk_perception/node_scripts/regional_feature_based_object_recognition.py
@@ -15,7 +15,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/ssd_object_detector.py b/jsk_perception/node_scripts/ssd_object_detector.py
index b77ddd0281..0ceec4bd2b 100755
--- a/jsk_perception/node_scripts/ssd_object_detector.py
+++ b/jsk_perception/node_scripts/ssd_object_detector.py
@@ -37,7 +37,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]
diff --git a/jsk_perception/node_scripts/vgg16_object_recognition.py b/jsk_perception/node_scripts/vgg16_object_recognition.py
index 2d0540aa03..ce29e13175 100755
--- a/jsk_perception/node_scripts/vgg16_object_recognition.py
+++ b/jsk_perception/node_scripts/vgg16_object_recognition.py
@@ -16,7 +16,7 @@
 c.f https://github.com/jsk-ros-pkg/jsk_recognition/pull/2485
 ''', file=sys.stderr)
     sys.exit(1)
-if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name ] == []:
+if [p for p in list(itertools.chain(*[pkg_resources.find_distributions(_) for _ in sys.path])) if "cupy-" in p.project_name or "cupy" == p.project_name ] == []:
     print('''Please install CuPy
 
     sudo pip install cupy-cuda[your cuda version]