easyvolcap: import fix bugs

zju3dv · Apr 6, 2024 · e25d37f · e25d37f
1 parent 602431a
commit e25d37f
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 23 deletions.
diff --git a/easyvolcap/dataloaders/__init__.py b/easyvolcap/dataloaders/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/dataloaders/datasets/__init__.py b/easyvolcap/dataloaders/datasets/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/__init__.py b/easyvolcap/models/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/cameras/__init__.py b/easyvolcap/models/cameras/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/networks/__init__.py b/easyvolcap/models/networks/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/networks/embedders/__init__.py b/easyvolcap/models/networks/embedders/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/renderers/__init__.py b/easyvolcap/models/renderers/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/samplers/__init__.py b/easyvolcap/models/samplers/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/models/supervisors/__init__.py b/easyvolcap/models/supervisors/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/runners/__init__.py b/easyvolcap/runners/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/easyvolcap/runners/evaluators/__init__.py b/easyvolcap/runners/evaluators/__init__.py
@@ -10,8 +10,10 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
         log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+
diff --git a/easyvolcap/runners/visualizers/__init__.py b/easyvolcap/runners/visualizers/__init__.py
@@ -10,8 +10,9 @@
         import sys
         from easyvolcap.utils.console_utils import *
 
-        exception_type, exception_object, exception_traceback = sys.exc_info()
+        tb = sys.exc_info()[-1]
+        tb = tb.tb_next
         filename = exception_traceback.tb_frame.f_code.co_filename
         line_number = exception_traceback.tb_lineno
 
-        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
+        log(yellow(f'Failed to import {red(basename(filename))}:{red(line_number)}, {red(type(e).__name__)}: {e}'))
diff --git a/requirements.txt b/requirements.txt
@@ -19,6 +19,7 @@ pypiwin32; sys_platform=='win32'
 pyperclip
 pyntcloud
 torchaudio
+websockets
 torchvision
 PyTurboJPEG
 tensorboard