Yapp99 commited on
Commit
faf1fab
·
1 Parent(s): e94f76c

Another bandaid fix

Browse files
Files changed (2) hide show
  1. app.py +1 -1
  2. utils.py +14 -13
app.py CHANGED
@@ -31,9 +31,9 @@ if input.strip():
31
  overall_tab = tabs[0]
32
  detail_tabs = tabs[1:]
33
 
34
-
35
  with overall_tab:
36
  st.header("Overall")
 
37
  whole_array = np.concatenate([np.sum(res.array, axis=-1) for res in results if res.job.done()])
38
 
39
  total = len(whole_array)
 
31
  overall_tab = tabs[0]
32
  detail_tabs = tabs[1:]
33
 
 
34
  with overall_tab:
35
  st.header("Overall")
36
+ print([res.job.status() for res in results])
37
  whole_array = np.concatenate([np.sum(res.array, axis=-1) for res in results if res.job.done()])
38
 
39
  total = len(whole_array)
utils.py CHANGED
@@ -30,16 +30,6 @@ MAPPING = {
30
  ANSATZ = IQPAnsatz(MAPPING, n_layers=1, discard=True)
31
  LOGGER = logging.getLogger(__name__)
32
 
33
- REWRITER = Rewriter([
34
- 'auxiliary',
35
- 'connector',
36
- 'determiner',
37
- 'postadverb',
38
- 'preadverb',
39
- 'prepositional_phrase',
40
- ])
41
- PARSER = BobcatParser('bert', cache_dir='./')
42
-
43
  @dataclass
44
  class QNLP_OUTPUT():
45
  tokens: str
@@ -67,6 +57,16 @@ class QNLP():
67
  'This action only has to happen once.')
68
  spacy.cli.download(model)
69
  self.nlp = spacy.load(model)
 
 
 
 
 
 
 
 
 
 
70
 
71
  def process_sentence(self,
72
  input_sentence: str,
@@ -78,13 +78,14 @@ class QNLP():
78
 
79
  def sentence2diagrams(sent: list[str], pb: tqdm = None):
80
  diagram = self.parser.sentence2diagram(sent, tokenised=True)
81
- diagram = REWRITER(diagram).normal_form()
82
 
83
  if pb: pb.update(1)
84
  return diagram
85
 
86
- pb = tqdm(total = len(sentences), desc="Splitting sentences")
87
- diagrams = Parallel(4, require='sharedmem')(delayed(sentence2diagrams)(s, pb) for s in sentences)
 
88
 
89
  qiskit_circuits = list(tk_to_qiskit(ANSATZ(diagram).to_tk()) for diagram in diagrams)
90
  for qc in qiskit_circuits : qc.measure_all()
 
30
  ANSATZ = IQPAnsatz(MAPPING, n_layers=1, discard=True)
31
  LOGGER = logging.getLogger(__name__)
32
 
 
 
 
 
 
 
 
 
 
 
33
  @dataclass
34
  class QNLP_OUTPUT():
35
  tokens: str
 
57
  'This action only has to happen once.')
58
  spacy.cli.download(model)
59
  self.nlp = spacy.load(model)
60
+
61
+ self.rewriter = Rewriter([
62
+ 'auxiliary',
63
+ 'connector',
64
+ 'determiner',
65
+ 'postadverb',
66
+ 'preadverb',
67
+ 'prepositional_phrase',
68
+ ])
69
+ self.parser = BobcatParser('bert', cache_dir='./')
70
 
71
  def process_sentence(self,
72
  input_sentence: str,
 
78
 
79
  def sentence2diagrams(sent: list[str], pb: tqdm = None):
80
  diagram = self.parser.sentence2diagram(sent, tokenised=True)
81
+ diagram = self.rewriter(diagram).normal_form()
82
 
83
  if pb: pb.update(1)
84
  return diagram
85
 
86
+ # pb = tqdm(total = len(sentences), desc="Splitting sentences")
87
+ # diagrams = Parallel(4, require='sharedmem')(delayed(sentence2diagrams)(s, pb) for s in sentences)
88
+ diagrams = list(sentence2diagrams(s) for s in sentences)
89
 
90
  qiskit_circuits = list(tk_to_qiskit(ANSATZ(diagram).to_tk()) for diagram in diagrams)
91
  for qc in qiskit_circuits : qc.measure_all()