Remove TF1 + TF2

README.md

@@ -1,8 +1,8 @@
 
 # Fast and scalable fitting of over-determined generalized-linear models (GLMs)
 
-batchglm was developed in the context of [diffxpy](https://github.com/theislab/diffxpy) to allow fast model fitting for differential expression analysis for single-cell RNA-seq data. However, one can use batchglm or its concepts in other scenarios where over-determined GLMs are encountered. batchglm is based on TensorFlow 
-
+batchglm was developed in the context of [diffxpy](https://github.com/theislab/diffxpy) to allow fast model fitting for differential expression analysis for single-cell RNA-seq data. However, one can use batchglm or its concepts in other scenarios where over-determined GLMs are encountered.
+<!-- 
 # Installation
 1. Install [tensorflow](https://www.tensorflow.org/install/), see below. Please use the pip installation if you are unsure.
 2. Clone the GitHub repository of batchglm.
@@ -22,4 +22,4 @@ You can install [tensorflow](https://www.tensorflow.org/install/) via pip or via
   `pip install tensorflow-gpu`
 
 ### Hardware-optimized tensorflow installation (compiling from source)
-Please refer to https://www.tensorflow.org/install/.
+Please refer to https://www.tensorflow.org/install/. -->

batchglm/api/models/__init__.py

@@ -1,14 +1 @@
 from . import numpy
-try:
-    import tensorflow as tf
-    if tf.__version__.split(".")[0] == "1":
-        from . import tf1
-    else:
-        tf1 = None
-    if tf.__version__.split(".")[0] == "2":
-        from . import tf2
-    else:
-        tf2 = None
-except ImportError:
-    tf1 = None
-    tf2 = None

batchglm/pkg_constants.py

@@ -25,25 +25,4 @@
 XTOL_BY_FEATURE_LOC = 1e-8
 XTOL_BY_FEATURE_SCALE = 1e-6
 GTOL_BY_FEATURE_LOC = 1e-8
-GTOL_BY_FEATURE_SCALE = 1e-8
-
-try:
-    import tensorflow as tf
-
-    TF_NUM_THREADS = int(os.environ.get('TF_NUM_THREADS', 0))
-    TF_LOOP_PARALLEL_ITERATIONS = int(os.environ.get('TF_LOOP_PARALLEL_ITERATIONS', 10))
-
-    TF_CONFIG_PROTO = tf.compat.v1.ConfigProto()
-    TF_CONFIG_PROTO.allow_soft_placement = True
-    TF_CONFIG_PROTO.log_device_placement = False
-    TF_CONFIG_PROTO.gpu_options.allow_growth = True
-    TF_CONFIG_PROTO.graph_options.optimizer_options.global_jit_level = tf.compat.v1.OptimizerOptions.ON_1
-
-    TF_CONFIG_PROTO.inter_op_parallelism_threads = TF_NUM_THREADS
-    TF_CONFIG_PROTO.intra_op_parallelism_threads = TF_NUM_THREADS
-
-    if TF_NUM_THREADS == 0:
-        TF_NUM_THREADS = multiprocessing.cpu_count()
-
-except ImportError:
-    tf = None
+GTOL_BY_FEATURE_SCALE = 1e-8