code-loader 1.0.99.dev8__py3-none-any.whl → 1.0.99.dev10__py3-none-any.whl

code_loader/inner_leap_binder/leapbinder_decorators.py

@@ -17,6 +17,9 @@ from code_loader.contract.visualizer_classes import LeapImage, LeapImageMask, Le
 from code_loader.inner_leap_binder.leapbinder import mapping_runtime_mode_env_var_mame
 
 
+
+_called_from_inside_tl_decorator = 0
+
 def _add_mapping_connection(user_unique_name, connection_destinations, arg_names, name, node_mapping_type):
     main_node_mapping = NodeMapping(name, node_mapping_type, user_unique_name, arg_names=arg_names)
     node_inputs = {}
@@ -41,6 +44,23 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
         class TempMapping:
             pass
 
+        def inner():
+            class ModelPlaceholder:
+                def __init__(self):
+                    self.model = load_model_func()
+                #keras interface
+                def __call__(self, arg):
+                    ret = self.model(arg)
+                    return ret.numpy()
+
+                # onnx runtime interface
+                def run(self, output_names, input_dict):
+                    return self.model.run(output_names, input_dict)
+
+
+            return ModelPlaceholder()
+
+
         def mapping_inner():
             class ModelOutputPlaceholder:
                 def __init__(self):
@@ -78,11 +98,13 @@ def tensorleap_load_model(prediction_types: Optional[List[PredictionTypeHandler]
             return ModelPlaceholder()
 
 
+
+
         def final_inner():
             if os.environ.get(mapping_runtime_mode_env_var_mame):
                 return mapping_inner()
             else:
-                return load_model_func()
+                return inner()
 
         return final_inner
 
@@ -185,7 +207,15 @@ def tensorleap_custom_metric(name: str,
 
         def inner(*args, **kwargs):
             _validate_input_args(*args, **kwargs)
-            result = user_function(*args, **kwargs)
+
+            global _called_from_inside_tl_decorator
+            _called_from_inside_tl_decorator += 1
+
+            try:
+                result = user_function(*args, **kwargs)
+            finally:
+                _called_from_inside_tl_decorator -= 1
+
             _validate_result(result)
             return result
 
@@ -268,7 +298,15 @@ def tensorleap_custom_visualizer(name: str, visualizer_type: LeapDataType,
 
         def inner(*args, **kwargs):
             _validate_input_args(*args, **kwargs)
-            result = user_function(*args, **kwargs)
+
+            global _called_from_inside_tl_decorator
+            _called_from_inside_tl_decorator += 1
+
+            try:
+                result = user_function(*args, **kwargs)
+            finally:
+                _called_from_inside_tl_decorator -= 1
+
             _validate_result(result)
             return result
 
@@ -340,7 +378,15 @@ def tensorleap_metadata(
                 return None
 
             _validate_input_args(sample_id, preprocess_response)
-            result = user_function(sample_id, preprocess_response)
+
+            global _called_from_inside_tl_decorator
+            _called_from_inside_tl_decorator += 1
+
+            try:
+                result = user_function(sample_id, preprocess_response)
+            finally:
+                _called_from_inside_tl_decorator -= 1
+
             _validate_result(result)
             return result
 
@@ -375,6 +421,7 @@ def tensorleap_preprocess():
                 return [None, None, None, None]
 
             _validate_input_args(*args, **kwargs)
+
             result = user_function()
             _validate_result(result)
             return result
@@ -446,6 +493,9 @@ def tensorleap_input_encoder(name: str, channel_dim=-1, model_input_index=None):
             _validate_input_args(sample_id, preprocess_response)
             result = user_function(sample_id, preprocess_response)
             _validate_result(result)
+
+            if _called_from_inside_tl_decorator == 0:
+                result = np.expand_dims(result, axis=0)
             return result
 
         node_mapping_type = NodeMappingType.Input
@@ -510,6 +560,9 @@ def tensorleap_gt_encoder(name: str):
             _validate_input_args(sample_id, preprocess_response)
             result = user_function(sample_id, preprocess_response)
             _validate_result(result)
+
+            if _called_from_inside_tl_decorator == 0:
+                result = np.expand_dims(result, axis=0)
             return result
 
         inner.node_mapping = NodeMapping(name, NodeMappingType.GroundTruth)
@@ -584,7 +637,15 @@ def tensorleap_custom_loss(name: str, connects_to=None):
 
         def inner(*args, **kwargs):
             _validate_input_args(*args, **kwargs)
-            result = user_function(*args, **kwargs)
+
+            global _called_from_inside_tl_decorator
+            _called_from_inside_tl_decorator += 1
+
+            try:
+                result = user_function(*args, **kwargs)
+            finally:
+                _called_from_inside_tl_decorator -= 1
+
             _validate_result(result)
             return result
 

{code_loader-1.0.99.dev8.dist-info → code_loader-1.0.99.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.99.dev8
+Version: 1.0.99.dev10
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.99.dev8.dist-info → code_loader-1.0.99.dev10.dist-info}/RECORD

@@ -21,13 +21,13 @@ code_loader/experiment_api/utils.py,sha256=XZHtxge12TS4H4-8PjV3sKuhp8Ud6ojAiIzTZ
 code_loader/experiment_api/workingspace_config_utils.py,sha256=DLzXQCg4dgTV_YgaSbeTVzq-2ja_SQw4zi7LXwKL9cY,990
 code_loader/inner_leap_binder/__init__.py,sha256=koOlJyMNYzGbEsoIbXathSmQ-L38N_pEXH_HvL7beXU,99
 code_loader/inner_leap_binder/leapbinder.py,sha256=FaX0kT-dEQJx4tS3LBfDxjf7Bi1LihkeEfLDHbyEbnM,31778
-code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=_jE2FSk1lSWnkv4OpWAFYkDjcp9yGMpTCwBuB2JCnV0,31385
+code_loader/inner_leap_binder/leapbinder_decorators.py,sha256=BP0JQdHZgng-HSTWhdZlIwj6Vu3OGm6aNtTwJC0pvlY,32951
 code_loader/leaploader.py,sha256=6SBhkhw2PVwCw1H4Krzl74CPG18n8F9NIrid1wEtTHs,26884
 code_loader/leaploaderbase.py,sha256=VH0vddRmkqLtcDlYPCO7hfz1_VbKo43lUdHDAbd4iJc,4198
 code_loader/utils.py,sha256=aw2i_fqW_ADjLB66FWZd9DfpCQ7mPdMyauROC5Nd51I,2197
 code_loader/visualizers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_loader/visualizers/default_visualizers.py,sha256=669lBpLISLO6my5Qcgn1FLDDeZgHumPf252m4KHY4YM,2555
-code_loader-1.0.99.dev8.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-code_loader-1.0.99.dev8.dist-info/METADATA,sha256=imOgCzWzKsQY3DsdhhfbPFgaU5lpuH08opU4psau7vU,854
-code_loader-1.0.99.dev8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-code_loader-1.0.99.dev8.dist-info/RECORD,,
+code_loader-1.0.99.dev10.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+code_loader-1.0.99.dev10.dist-info/METADATA,sha256=7fnnb4TUCR5SVKZK9WFXOWhjZX6Jr-g7c01TUnR-AWE,855
+code_loader-1.0.99.dev10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+code_loader-1.0.99.dev10.dist-info/RECORD,,