Merge branch 'JuMP-Julia' into JuMP

cog-imperial · Oct 3, 2024 · a64316b · a64316b
2 parents 877aac1 + ac0912c
commit a64316b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/src/omlt/base/__init__.py b/src/omlt/base/__init__.py
@@ -1,5 +1,10 @@
 from omlt.base.language import DEFAULT_MODELING_LANGUAGE
 
+from omlt.dependencies import julia_available
+
+# if julia_available:
+#     from omlt.base.julia import jl, jump
+
 from omlt.base.constraint import (
     OmltConstraint,
     OmltConstraintFactory,
@@ -15,7 +20,7 @@
     OmltScalarPyomo,
 )
 from omlt.base.var import OmltIndexed, OmltScalar, OmltVar, OmltVarFactory
-from omlt.dependencies import julia_available
+
 
 __all__ = [
     "DEFAULT_MODELING_LANGUAGE",