Skip to content

Commit

Permalink
Bump version and update dependencies (#1722)
Browse files Browse the repository at this point in the history
Removes websockets dependency and makes jinja2 dependency optional
  • Loading branch information
tbennun authored Nov 2, 2024
1 parent 2c41491 commit 636811d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 26 deletions.
5 changes: 0 additions & 5 deletions dace/cli/dacelab.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
# Copyright 2019-2021 ETH Zurich and the DaCe authors. All rights reserved.

import argparse
import numpy
import pickle
import json

import dace
from dace.frontend.octave import parse
from dace.sdfg.nodes import AccessNode

Expand Down
6 changes: 5 additions & 1 deletion dace/cli/sdfg_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import tempfile
from typing import Dict, Literal, Set, Tuple, Union

import jinja2
import dace
from dace import memlet as mlt
from dace.sdfg import nodes as nd
Expand Down Expand Up @@ -179,6 +178,11 @@ def main():
diff_sets = _sdfg_diff(sdfg_A, sdfg_B, eq_strategy)

if args.graphical:
try:
import jinja2
except (ImportError, ModuleNotFoundError):
raise ImportError('Graphical SDFG diff requires jinja2, please install by running `pip install jinja2`')

basepath = os.path.join(os.path.dirname(os.path.realpath(dace.__file__)), 'viewer')
template_loader = jinja2.FileSystemLoader(searchpath=os.path.join(basepath, 'templates'))
template_env = jinja2.Environment(loader=template_loader)
Expand Down
6 changes: 5 additions & 1 deletion dace/cli/sdfv.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import dace
import tempfile
import jinja2


def partialclass(cls, *args, **kwds):
Expand Down Expand Up @@ -48,6 +47,11 @@ def view(sdfg: dace.SDFG, filename: Optional[Union[str, int]] = None, verbose: b
os.close(fd)
return

try:
import jinja2
except (ImportError, ModuleNotFoundError):
raise ImportError('SDFG.view() requires jinja2, please install by running `pip install jinja2`')

if type(sdfg) is dace.SDFG:
sdfg = dace.serialize.dumps(sdfg.to_json())

Expand Down
2 changes: 1 addition & 1 deletion dace/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.16.1'
__version__ = '1.0.0'
25 changes: 8 additions & 17 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
aenum==3.1.12
aenum==3.1.15
astunparse==1.6.3
certifi==2024.7.4
charset-normalizer==3.1.0
click==8.1.3
dill==0.3.6
fparser==0.1.3
idna==3.7
importlib-metadata==6.6.0
Jinja2==3.1.4
MarkupSafe==2.1.3
dill==0.3.9
fparser==0.1.4
mpmath==1.3.0
networkx==3.1
numpy==1.26.1
networkx==3.4.2
numpy==1.26.4
packaging==24.1
ply==3.11
PyYAML==6.0.1
PyYAML==6.0.2
six==1.16.0
sympy==1.9
urllib3==2.2.2
websockets==11.0.3
zipp==3.15.0
sympy==1.13.3
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
include_package_data=True,
install_requires=[
'numpy < 2.0', 'networkx >= 2.5', 'astunparse', 'sympy >= 1.9', 'pyyaml', 'ply', 'websockets', 'jinja2',
'numpy < 2.0', 'networkx >= 2.5', 'astunparse', 'sympy >= 1.9', 'pyyaml', 'ply',
'fparser >= 0.1.3', 'aenum >= 3.1', 'dataclasses; python_version < "3.7"', 'dill',
'pyreadline;platform_system=="Windows"', 'typing-compat; python_version < "3.8"', 'packaging'
] + cmake_requires,
Expand Down

0 comments on commit 636811d

Please sign in to comment.