|
 |
965356c |
From d43ae0fa591cabc84bee2a916f5b69fb14bc5d32 Mon Sep 17 00:00:00 2001
|
|
|
0cc9008 |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
|
0cc9008 |
Date: Thu, 8 Oct 2020 21:32:44 +0100
|
|
|
ff17f0f |
Subject: [PATCH 05/11] Correct librxdmath path for 64bit
|
|
|
0cc9008 |
|
|
|
0cc9008 |
---
|
|
|
965356c |
share/lib/python/neuron/rxd/rxd.py | 11 +++++++----
|
|
|
965356c |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
0cc9008 |
|
|
|
0cc9008 |
diff --git a/share/lib/python/neuron/rxd/rxd.py b/share/lib/python/neuron/rxd/rxd.py
|
|
|
965356c |
index 698381dfe..29f42d203 100644
|
|
|
0cc9008 |
--- a/share/lib/python/neuron/rxd/rxd.py
|
|
|
0cc9008 |
+++ b/share/lib/python/neuron/rxd/rxd.py
|
|
|
965356c |
@@ -500,10 +500,13 @@ def _find_librxdmath():
|
|
|
0cc9008 |
base_path = os.path.join(h.neuronhome(), "..", "..", platform.machine())
|
|
|
0cc9008 |
if not os.path.exists(base_path):
|
|
|
0cc9008 |
base_path = os.path.join(h.neuronhome(), "..", "..")
|
|
|
0cc9008 |
- base_path = os.path.join(base_path, "lib", "librxdmath")
|
|
|
965356c |
- success = False
|
|
|
965356c |
- for extension in ["", ".dll", ".so", ".dylib"]:
|
|
|
965356c |
- dll = base_path + extension
|
|
|
0cc9008 |
+ if platform.architecture()[0] == "64bit":
|
|
|
0cc9008 |
+ base_path = os.path.join(base_path, "lib64", "librxdmath")
|
|
|
0cc9008 |
+ else:
|
|
|
0cc9008 |
+ base_path = os.path.join(base_path, "lib", "librxdmath")
|
|
|
965356c |
+ success = False
|
|
|
965356c |
+ for extension in ['', '.dll', '.so', '.dylib']:
|
|
|
965356c |
+ dll = base_path + extension
|
|
|
965356c |
try:
|
|
|
965356c |
success = os.path.exists(dll)
|
|
|
965356c |
except:
|
|
|
0cc9008 |
--
|
|
|
965356c |
2.39.1
|
|
|
0cc9008 |
|