Automatically download models on demand

LetsData-net · Dec 8, 2021 · ea6766f · ea6766f
1 parent 181b970
commit ea6766f
Show file tree

Hide file tree

Showing 110 changed files with 209 additions and 207 deletions.
diff --git a/DeepNewsSentiment/.gitignore → NewsSentiment/.gitignore b/DeepNewsSentiment/.gitignore → NewsSentiment/.gitignore
diff --git a/DeepNewsSentiment/DatasetPreparer.py → NewsSentiment/DatasetPreparer.py b/DeepNewsSentiment/DatasetPreparer.py → NewsSentiment/DatasetPreparer.py
@@ -13,8 +13,8 @@
 import jsonlines
 from tabulate import tabulate
 
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.fxlogger import get_logger
 
 
 class DatasetPreparer:

diff --git a/DeepNewsSentiment/LICENSE → NewsSentiment/LICENSE b/DeepNewsSentiment/LICENSE → NewsSentiment/LICENSE
diff --git a/DeepNewsSentiment/README.md → NewsSentiment/README.md b/DeepNewsSentiment/README.md → NewsSentiment/README.md
diff --git a/DeepNewsSentiment/SentimentClasses.py → NewsSentiment/SentimentClasses.py b/DeepNewsSentiment/SentimentClasses.py → NewsSentiment/SentimentClasses.py
diff --git a/DeepNewsSentiment/__init__.py → NewsSentiment/__init__.py b/DeepNewsSentiment/__init__.py → NewsSentiment/__init__.py
diff --git a/DeepNewsSentiment/__main__.py → NewsSentiment/__main__.py b/DeepNewsSentiment/__main__.py → NewsSentiment/__main__.py
@@ -1,9 +1,9 @@
 import argparse
 
-from DeepNewsSentiment.download import Download
+from NewsSentiment.download import Download
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(prog='DeepNewsAnalysis')
+    parser = argparse.ArgumentParser(prog='NewsSentiment')
     subparsers = parser.add_subparsers(dest='action')
 
     subparser_download = subparsers.add_parser('download', help=Download.add_subparser.__doc__)

diff --git a/DeepNewsSentiment/combinations_default.py → NewsSentiment/combinations_default.py b/DeepNewsSentiment/combinations_default.py → NewsSentiment/combinations_default.py
@@ -1,4 +1,4 @@
-from DeepNewsSentiment.consts import BERT_BASE_UNCASED
+from NewsSentiment.consts import BERT_BASE_UNCASED
 
 combinations_default_0 = {
     "own_model_name": [

diff --git a/DeepNewsSentiment/consts.py → NewsSentiment/consts.py b/DeepNewsSentiment/consts.py → NewsSentiment/consts.py
diff --git a/DeepNewsSentiment/controller.py → NewsSentiment/controller.py b/DeepNewsSentiment/controller.py → NewsSentiment/controller.py
@@ -32,24 +32,24 @@
 from tabulate import tabulate
 from tqdm import tqdm
 
-from DeepNewsSentiment.combinations_ensemble import combinations_ensemble
-from DeepNewsSentiment.combinations_final_lcf2 import combinations_final_lcf2
-from DeepNewsSentiment.combinations_final_nostance import combinations_final_nostance
-from DeepNewsSentiment.combinations_final_spc import combinations_final_spc
-from DeepNewsSentiment.combinations_final_stance0 import combinations_final_stance0
-from DeepNewsSentiment.combinations_final_stance1 import combinations_final_stance1
-from DeepNewsSentiment.combinations_final_tdbert import combinations_final_tdbert
-from DeepNewsSentiment.combinations_top import combinations_top
-from DeepNewsSentiment.DatasetPreparer import DatasetPreparer
-from DeepNewsSentiment.combinations_default import combinations_default_0
-from DeepNewsSentiment.combinations_top4otherdomains import combinations_top4otherdomains
-from DeepNewsSentiment.combinations_top_coref16 import combinations_top_coref16
-from DeepNewsSentiment.combinations_top_coref8 import combinations_top_coref8
-from DeepNewsSentiment.combinations_top_coref8_stanceno import combinations_top_coref8_stanceno
-from DeepNewsSentiment.combinations_top_finetuned import combinations_top_finetuned
-from DeepNewsSentiment.diskdict import DiskDict
-from DeepNewsSentiment.fxlogger import get_logger
-from DeepNewsSentiment.train import str2bool
+from NewsSentiment.combinations_ensemble import combinations_ensemble
+from NewsSentiment.combinations_final_lcf2 import combinations_final_lcf2
+from NewsSentiment.combinations_final_nostance import combinations_final_nostance
+from NewsSentiment.combinations_final_spc import combinations_final_spc
+from NewsSentiment.combinations_final_stance0 import combinations_final_stance0
+from NewsSentiment.combinations_final_stance1 import combinations_final_stance1
+from NewsSentiment.combinations_final_tdbert import combinations_final_tdbert
+from NewsSentiment.combinations_top import combinations_top
+from NewsSentiment.DatasetPreparer import DatasetPreparer
+from NewsSentiment.combinations_default import combinations_default_0
+from NewsSentiment.combinations_top4otherdomains import combinations_top4otherdomains
+from NewsSentiment.combinations_top_coref16 import combinations_top_coref16
+from NewsSentiment.combinations_top_coref8 import combinations_top_coref8
+from NewsSentiment.combinations_top_coref8_stanceno import combinations_top_coref8_stanceno
+from NewsSentiment.combinations_top_finetuned import combinations_top_finetuned
+from NewsSentiment.diskdict import DiskDict
+from NewsSentiment.fxlogger import get_logger
+from NewsSentiment.train import str2bool
 
 completed_tasks = None  # will be DiskDict later
 completed_tasks_in_this_run_count = 0

diff --git a/...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip → ...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip b/...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip → ...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip
diff --git a/...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf → ...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf b/...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf → ...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf
diff --git a/...atasets/NewsMTSC-dataset/devtest_mt.jsonl → ...atasets/NewsMTSC-dataset/devtest_mt.jsonl b/...atasets/NewsMTSC-dataset/devtest_mt.jsonl → ...atasets/NewsMTSC-dataset/devtest_mt.jsonl
diff --git a/...atasets/NewsMTSC-dataset/devtest_rw.jsonl → ...atasets/NewsMTSC-dataset/devtest_rw.jsonl b/...atasets/NewsMTSC-dataset/devtest_rw.jsonl → ...atasets/NewsMTSC-dataset/devtest_rw.jsonl
diff --git a/..._data/datasets/NewsMTSC-dataset/readme.md → ..._data/datasets/NewsMTSC-dataset/readme.md b/..._data/datasets/NewsMTSC-dataset/readme.md → ..._data/datasets/NewsMTSC-dataset/readme.md
diff --git a/...ata/datasets/NewsMTSC-dataset/train.jsonl → ...ata/datasets/NewsMTSC-dataset/train.jsonl b/...ata/datasets/NewsMTSC-dataset/train.jsonl → ...ata/datasets/NewsMTSC-dataset/train.jsonl
diff --git a/...data/datasets/acl14twitter/test.raw.jsonl → ...data/datasets/acl14twitter/test.raw.jsonl b/...data/datasets/acl14twitter/test.raw.jsonl → ...data/datasets/acl14twitter/test.raw.jsonl
diff --git a/...ata/datasets/acl14twitter/train.raw.jsonl → ...ata/datasets/acl14twitter/train.raw.jsonl b/...ata/datasets/acl14twitter/train.raw.jsonl → ...ata/datasets/acl14twitter/train.raw.jsonl
diff --git a/...train-and-test-mt/devtest_mtsc_only.jsonl → ...train-and-test-mt/devtest_mtsc_only.jsonl b/...train-and-test-mt/devtest_mtsc_only.jsonl → ...train-and-test-mt/devtest_mtsc_only.jsonl
diff --git a/...ts/newsmtsc-train-and-test-mt/train.jsonl → ...ts/newsmtsc-train-and-test-mt/train.jsonl b/...ts/newsmtsc-train-and-test-mt/train.jsonl → ...ts/newsmtsc-train-and-test-mt/train.jsonl
diff --git a/...w/devtest_mtsc_and_single_primaries.jsonl → ...w/devtest_mtsc_and_single_primaries.jsonl b/...w/devtest_mtsc_and_single_primaries.jsonl → ...w/devtest_mtsc_and_single_primaries.jsonl
diff --git a/...ts/newsmtsc-train-and-test-rw/train.jsonl → ...ts/newsmtsc-train-and-test-rw/train.jsonl b/...ts/newsmtsc-train-and-test-rw/train.jsonl → ...ts/newsmtsc-train-and-test-rw/train.jsonl
diff --git a/...14laptops/Laptops_Test_Gold.xml.seg.jsonl → ...14laptops/Laptops_Test_Gold.xml.seg.jsonl b/...14laptops/Laptops_Test_Gold.xml.seg.jsonl → ...14laptops/Laptops_Test_Gold.xml.seg.jsonl
diff --git a/...eval14laptops/Laptops_Train.xml.seg.jsonl → ...eval14laptops/Laptops_Train.xml.seg.jsonl b/...eval14laptops/Laptops_Train.xml.seg.jsonl → ...eval14laptops/Laptops_Train.xml.seg.jsonl
diff --git a/...rants/Restaurants_Test_Gold.xml.seg.jsonl → ...rants/Restaurants_Test_Gold.xml.seg.jsonl b/...rants/Restaurants_Test_Gold.xml.seg.jsonl → ...rants/Restaurants_Test_Gold.xml.seg.jsonl
diff --git a/...staurants/Restaurants_Train.xml.seg.jsonl → ...staurants/Restaurants_Train.xml.seg.jsonl b/...staurants/Restaurants_Train.xml.seg.jsonl → ...staurants/Restaurants_Train.xml.seg.jsonl
diff --git a/DeepNewsSentiment/createoverview.py → NewsSentiment/createoverview.py b/DeepNewsSentiment/createoverview.py → NewsSentiment/createoverview.py
@@ -7,7 +7,7 @@
 import jsonlines
 import pandas as pd
 
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.fxlogger import get_logger
 
 logger = get_logger()
 

diff --git a/DeepNewsSentiment/customexceptions.py → NewsSentiment/customexceptions.py b/DeepNewsSentiment/customexceptions.py → NewsSentiment/customexceptions.py
diff --git a/DeepNewsSentiment/dataset.py → NewsSentiment/dataset.py b/DeepNewsSentiment/dataset.py → NewsSentiment/dataset.py
@@ -17,26 +17,26 @@
     AlbertTokenizer,
 )
 
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
-from DeepNewsSentiment.customexceptions import TooLongTextException, TargetNotFoundException
-from DeepNewsSentiment.consts import *
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.customexceptions import TooLongTextException, TargetNotFoundException
+from NewsSentiment.consts import *
+from NewsSentiment.fxlogger import get_logger
 
 # get logger
-from DeepNewsSentiment.knowledge.bingliuopinion.bingliuopinion import (
+from NewsSentiment.knowledge.bingliuopinion.bingliuopinion import (
     get_bingliu_polarities_as_tensor,
     get_num_bingliu_polarities,
 )
-from DeepNewsSentiment.knowledge.mpqasubjectivity.mpqasubjectivity import (
+from NewsSentiment.knowledge.mpqasubjectivity.mpqasubjectivity import (
     get_mpqa_subjectivity_polarities_as_tensor,
     get_num_mpqa_subjectivity_polarities,
 )
-from DeepNewsSentiment.knowledge.nrcemolex.nrcemolex import (
+from NewsSentiment.knowledge.nrcemolex.nrcemolex import (
     get_nrc_emotions_as_tensor,
     get_num_nrc_emotions,
 )
-from DeepNewsSentiment.knowledge.zeros.zerosknowledge import get_num_zero_dimensions, get_zeros_as_tensor
-from DeepNewsSentiment.models.FXBaseModel import FXBaseModel
+from NewsSentiment.knowledge.zeros.zerosknowledge import get_num_zero_dimensions, get_zeros_as_tensor
+from NewsSentiment.models.FXBaseModel import FXBaseModel
 
 logger = get_logger()
 try:

diff --git a/DeepNewsSentiment/diskdict.py → NewsSentiment/diskdict.py b/DeepNewsSentiment/diskdict.py → NewsSentiment/diskdict.py
@@ -2,7 +2,7 @@
 import pickle
 from typing import Union
 
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.fxlogger import get_logger
 
 logger = get_logger()
 

diff --git a/DeepNewsSentiment/download.py → NewsSentiment/download.py b/DeepNewsSentiment/download.py → NewsSentiment/download.py
@@ -6,16 +6,16 @@
 
 import torch
 
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.fxlogger import get_logger
 
 
 class Download:
 
     def __init__(
         self, own_model_name, version="default", force=False, list_versions=False
     ):
-        from DeepNewsSentiment.models.FXBaseModel import model_includes_pretrained
-        from DeepNewsSentiment.train import OWN_MODELNAME2CLASS
+        from NewsSentiment.models.FXBaseModel import model_includes_pretrained
+        from NewsSentiment.train import OWN_MODELNAME2CLASS
 
         logger = get_logger()
         own_model_name = own_model_name
@@ -50,15 +50,18 @@ def list_versions(model_cls, own_model_name=""):
             print(f'"{version}"{default_str}: {source}')
 
     @classmethod
-    def download(cls, model_cls, version=None, force=False):
+    def download(cls, model_cls, version=None, force=False, skip_if_exists=True):
         source = model_cls.get_pretrained_source(version)
         path = cls.model_path(model_cls, version)
         if not force and os.path.isfile(path):
+            if skip_if_exists:
+                return
             print("Model file already exists. Use --force to overwrite.")
             exit(2)
         print(f"Downloading to {path}:")
         os.makedirs(os.path.dirname(path), exist_ok=True)
         torch.hub.download_url_to_file(source, path)
+        return path
 
     @staticmethod
     def model_filename(model_cls, version=None):
@@ -78,7 +81,7 @@ def model_path(cls, model_cls, version=None):
 
     @staticmethod
     def add_subparser(subparser):
-        """Download models for DeepNewsSentiment"""
+        """Download models for NewsSentiment"""
         subparser.add_argument("--own_model_name", default="grutsc", type=str)
         subparser.add_argument(
             "--version",

diff --git a/DeepNewsSentiment/earlystopping.py → NewsSentiment/earlystopping.py b/DeepNewsSentiment/earlystopping.py → NewsSentiment/earlystopping.py
@@ -2,7 +2,7 @@
 # Copyright by Bjarten
 # License: MIT
 
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.fxlogger import get_logger
 
 
 class EarlyStopping:

diff --git a/DeepNewsSentiment/evaluator.py → NewsSentiment/evaluator.py b/DeepNewsSentiment/evaluator.py → NewsSentiment/evaluator.py
@@ -5,9 +5,9 @@
 import numpy as np
 from sklearn import metrics
 
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
-from DeepNewsSentiment.dataset import FXDataset
-from DeepNewsSentiment.fxlogger import get_logger
+from NewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.dataset import FXDataset
+from NewsSentiment.fxlogger import get_logger
 
 
 class Evaluator:

diff --git a/...ts/default/datasets/newsmtsc-mt/dev.jsonl → ...ts/default/datasets/newsmtsc-mt/dev.jsonl b/...ts/default/datasets/newsmtsc-mt/dev.jsonl → ...ts/default/datasets/newsmtsc-mt/dev.jsonl
diff --git a/...s/default/datasets/newsmtsc-mt/test.jsonl → ...s/default/datasets/newsmtsc-mt/test.jsonl b/...s/default/datasets/newsmtsc-mt/test.jsonl → ...s/default/datasets/newsmtsc-mt/test.jsonl
diff --git a/.../default/datasets/newsmtsc-mt/train.jsonl → .../default/datasets/newsmtsc-mt/train.jsonl b/.../default/datasets/newsmtsc-mt/train.jsonl → .../default/datasets/newsmtsc-mt/train.jsonl
diff --git a/...ts/default/datasets/newsmtsc-rw/dev.jsonl → ...ts/default/datasets/newsmtsc-rw/dev.jsonl b/...ts/default/datasets/newsmtsc-rw/dev.jsonl → ...ts/default/datasets/newsmtsc-rw/dev.jsonl
diff --git a/...s/default/datasets/newsmtsc-rw/test.jsonl → ...s/default/datasets/newsmtsc-rw/test.jsonl b/...s/default/datasets/newsmtsc-rw/test.jsonl → ...s/default/datasets/newsmtsc-rw/test.jsonl
diff --git a/.../default/datasets/newsmtsc-rw/train.jsonl → .../default/datasets/newsmtsc-rw/train.jsonl b/.../default/datasets/newsmtsc-rw/train.jsonl → .../default/datasets/newsmtsc-rw/train.jsonl
diff --git a/DeepNewsSentiment/fxlogger.py → NewsSentiment/fxlogger.py b/DeepNewsSentiment/fxlogger.py → NewsSentiment/fxlogger.py
@@ -13,9 +13,9 @@ def get_logger():
         handler = logging.StreamHandler()
         handler.setFormatter(formatter)
 
-        logger = logging.getLogger("DeepNewsSentiment")
+        logger = logging.getLogger("NewsSentiment")
         if logger.level == logging.NOTSET:
-            logger.setLevel(logging.INFO)
+            logger.setLevel(logging.ERROR)
 
         if len(logger.handlers) == 0:
             logger.addHandler(handler)

diff --git a/DeepNewsSentiment/infer.py → NewsSentiment/infer.py b/DeepNewsSentiment/infer.py → NewsSentiment/infer.py
@@ -5,12 +5,12 @@
 from jsonlines import jsonlines
 from tqdm import tqdm
 
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
-from DeepNewsSentiment.dataset import FXEasyTokenizer
-from DeepNewsSentiment.download import Download
-from DeepNewsSentiment.fxlogger import get_logger
-from DeepNewsSentiment.models.singletarget.grutscsingle import GRUTSCSingle
-from DeepNewsSentiment.train import (
+from NewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.dataset import FXEasyTokenizer
+from NewsSentiment.download import Download
+from NewsSentiment.fxlogger import get_logger
+from NewsSentiment.models.singletarget.grutscsingle import GRUTSCSingle
+from NewsSentiment.train import (
     parse_arguments as parse_arguments_from_train,
     prepare_and_start_instructor,
 )
@@ -142,7 +142,7 @@ def parse_arguments(override_args=False):
     )
     parser.add_argument("--default_lm", default="roberta-base", type=str)
     parser.add_argument(
-        "--state_dict", type=str, default=Download.model_filename(GRUTSCSingle)
+        "--state_dict", type=str, default=Download.model_path(GRUTSCSingle)
     )
     parser.add_argument(
         "--knowledgesources", default="nrc_emotions mpqa_subjectivity bingliu_opinion"

diff --git a/DeepNewsSentiment/knowledge/__init__.py → NewsSentiment/knowledge/__init__.py b/DeepNewsSentiment/knowledge/__init__.py → NewsSentiment/knowledge/__init__.py
diff --git a/...nowledge/bingliuopinion/bingliuopinion.py → ...nowledge/bingliuopinion/bingliuopinion.py b/...nowledge/bingliuopinion/bingliuopinion.py → ...nowledge/bingliuopinion/bingliuopinion.py
@@ -1,8 +1,8 @@
 import torch
 
-from DeepNewsSentiment.diskdict import DiskDict
-from DeepNewsSentiment.knowledge.bingliuopinion.converter import PATH_DICT_BING_LIU_OPINION_POLARITY, POLARITY2INDEX
-from DeepNewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
+from NewsSentiment.diskdict import DiskDict
+from NewsSentiment.knowledge.bingliuopinion.converter import PATH_DICT_BING_LIU_OPINION_POLARITY, POLARITY2INDEX
+from NewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
 
 __ddict_emolex = DiskDict(PATH_DICT_BING_LIU_OPINION_POLARITY)
 __ddict_emolex_keys_lower = {k.lower(): v for k, v in __ddict_emolex.items()}

diff --git a/...ent/knowledge/bingliuopinion/converter.py → ...ent/knowledge/bingliuopinion/converter.py b/...ent/knowledge/bingliuopinion/converter.py → ...ent/knowledge/bingliuopinion/converter.py
@@ -5,8 +5,8 @@
 
 from tqdm import tqdm
 
-from DeepNewsSentiment.fxlogger import get_logger
-from DeepNewsSentiment.diskdict import DiskDict
+from NewsSentiment.fxlogger import get_logger
+from NewsSentiment.diskdict import DiskDict
 
 POLARITY2INDEX = {
     "positive": 1,

diff --git a/...ment/knowledge/bingliuopinion/license.txt → ...ment/knowledge/bingliuopinion/license.txt b/...ment/knowledge/bingliuopinion/license.txt → ...ment/knowledge/bingliuopinion/license.txt
diff --git a/...owledge/bingliuopinion/negative-words.txt → ...owledge/bingliuopinion/negative-words.txt b/...owledge/bingliuopinion/negative-words.txt → ...owledge/bingliuopinion/negative-words.txt
diff --git a/...dge/bingliuopinion/opinion_polarity.ddict → ...dge/bingliuopinion/opinion_polarity.ddict b/...dge/bingliuopinion/opinion_polarity.ddict → ...dge/bingliuopinion/opinion_polarity.ddict
diff --git a/...owledge/bingliuopinion/positive-words.txt → ...owledge/bingliuopinion/positive-words.txt b/...owledge/bingliuopinion/positive-words.txt → ...owledge/bingliuopinion/positive-words.txt
diff --git a/...NewsSentiment/knowledge/knowledgeutils.py → NewsSentiment/knowledge/knowledgeutils.py b/...NewsSentiment/knowledge/knowledgeutils.py → NewsSentiment/knowledge/knowledgeutils.py
diff --git a/...sSentiment/knowledge/liwc/data/.gitignore → NewsSentiment/knowledge/liwc/data/.gitignore b/...sSentiment/knowledge/liwc/data/.gitignore → NewsSentiment/knowledge/liwc/data/.gitignore
diff --git a/...sSentiment/knowledge/liwc/data/readme.txt → NewsSentiment/knowledge/liwc/data/readme.txt b/...sSentiment/knowledge/liwc/data/readme.txt → NewsSentiment/knowledge/liwc/data/readme.txt
diff --git a/DeepNewsSentiment/knowledge/liwc/dic.py → NewsSentiment/knowledge/liwc/dic.py b/DeepNewsSentiment/knowledge/liwc/dic.py → NewsSentiment/knowledge/liwc/dic.py
diff --git a/DeepNewsSentiment/knowledge/liwc/liwc.py → NewsSentiment/knowledge/liwc/liwc.py b/DeepNewsSentiment/knowledge/liwc/liwc.py → NewsSentiment/knowledge/liwc/liwc.py
@@ -1,6 +1,6 @@
 import torch
 
-from DeepNewsSentiment.knowledge.liwc.liwchelper import load_token_parser
+from NewsSentiment.knowledge.liwc.liwchelper import load_token_parser
 
 parse, category_names = load_token_parser()
 

diff --git a/...ewsSentiment/knowledge/liwc/liwchelper.py → NewsSentiment/knowledge/liwc/liwchelper.py b/...ewsSentiment/knowledge/liwc/liwchelper.py → NewsSentiment/knowledge/liwc/liwchelper.py
diff --git a/DeepNewsSentiment/knowledge/liwc/trie.py → NewsSentiment/knowledge/liwc/trie.py b/DeepNewsSentiment/knowledge/liwc/trie.py → NewsSentiment/knowledge/liwc/trie.py
diff --git a/...t/knowledge/mpqasubjectivity/converter.py → ...t/knowledge/mpqasubjectivity/converter.py b/...t/knowledge/mpqasubjectivity/converter.py → ...t/knowledge/mpqasubjectivity/converter.py
@@ -5,8 +5,8 @@
 
 from tqdm import tqdm
 
-from DeepNewsSentiment.fxlogger import get_logger
-from DeepNewsSentiment.diskdict import DiskDict
+from NewsSentiment.fxlogger import get_logger
+from NewsSentiment.diskdict import DiskDict
 
 POLARITY2INDEX = {
     "positive": 2,

diff --git a/...edge/mpqasubjectivity/mpqasubjectivity.py → ...edge/mpqasubjectivity/mpqasubjectivity.py b/...edge/mpqasubjectivity/mpqasubjectivity.py → ...edge/mpqasubjectivity/mpqasubjectivity.py
@@ -1,8 +1,8 @@
 import torch
 
-from DeepNewsSentiment.diskdict import DiskDict
-from DeepNewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
-from DeepNewsSentiment.knowledge.mpqasubjectivity.converter import POLARITY2INDEX, PATH_DICT_MPQA_SUBJECTIVITY
+from NewsSentiment.diskdict import DiskDict
+from NewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
+from NewsSentiment.knowledge.mpqasubjectivity.converter import POLARITY2INDEX, PATH_DICT_MPQA_SUBJECTIVITY
 
 __ddict_emolex = DiskDict(PATH_DICT_MPQA_SUBJECTIVITY)
 __ddict_emolex_keys_lower = {k.lower(): v for k, v in __ddict_emolex.items()}

diff --git a/...subjectivity/subjclueslen1-HLTEMNLP05.tff → ...subjectivity/subjclueslen1-HLTEMNLP05.tff b/...subjectivity/subjclueslen1-HLTEMNLP05.tff → ...subjectivity/subjclueslen1-HLTEMNLP05.tff
diff --git a/...tivity/subjclueslen1-HLTEMNLP05.tff.ddict → ...tivity/subjclueslen1-HLTEMNLP05.tff.ddict b/...tivity/subjclueslen1-HLTEMNLP05.tff.ddict → ...tivity/subjclueslen1-HLTEMNLP05.tff.ddict
diff --git a/...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt → ...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt b/...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt → ...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt
diff --git a/...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict → ...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict b/...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict → ...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict
diff --git a/...entiment/knowledge/nrcemolex/converter.py → ...entiment/knowledge/nrcemolex/converter.py b/...entiment/knowledge/nrcemolex/converter.py → ...entiment/knowledge/nrcemolex/converter.py
@@ -3,8 +3,8 @@
 from pathlib import Path
 import csv
 
-from DeepNewsSentiment.fxlogger import get_logger
-from DeepNewsSentiment.diskdict import DiskDict
+from NewsSentiment.fxlogger import get_logger
+from NewsSentiment.diskdict import DiskDict
 
 EMOTION2INDEX = {
     "anger": 0,

diff --git a/...entiment/knowledge/nrcemolex/nrcemolex.py → ...entiment/knowledge/nrcemolex/nrcemolex.py b/...entiment/knowledge/nrcemolex/nrcemolex.py → ...entiment/knowledge/nrcemolex/nrcemolex.py
@@ -1,8 +1,8 @@
 import torch
 
-from DeepNewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
-from DeepNewsSentiment.knowledge.nrcemolex.converter import PATH_DICT_NRC_EMOLEX, EMOTION2INDEX
-from DeepNewsSentiment.diskdict import DiskDict
+from NewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
+from NewsSentiment.knowledge.nrcemolex.converter import PATH_DICT_NRC_EMOLEX, EMOTION2INDEX
+from NewsSentiment.diskdict import DiskDict
 
 __ddict_emolex = DiskDict(PATH_DICT_NRC_EMOLEX)
 __ddict_emolex_keys_lower = {k.lower(): v for k, v in __ddict_emolex.items()}

diff --git a/...ntiment/knowledge/zeros/zerosknowledge.py → ...ntiment/knowledge/zeros/zerosknowledge.py b/...ntiment/knowledge/zeros/zerosknowledge.py → ...ntiment/knowledge/zeros/zerosknowledge.py
diff --git a/...NewsSentiment/layers/AggregatorForBert.py → NewsSentiment/layers/AggregatorForBert.py b/...NewsSentiment/layers/AggregatorForBert.py → NewsSentiment/layers/AggregatorForBert.py
diff --git a/DeepNewsSentiment/layers/__init__.py → NewsSentiment/layers/__init__.py b/DeepNewsSentiment/layers/__init__.py → NewsSentiment/layers/__init__.py
diff --git a/DeepNewsSentiment/layers/attention.py → NewsSentiment/layers/attention.py b/DeepNewsSentiment/layers/attention.py → NewsSentiment/layers/attention.py
diff --git a/DeepNewsSentiment/layers/dynamic_rnn.py → NewsSentiment/layers/dynamic_rnn.py b/DeepNewsSentiment/layers/dynamic_rnn.py → NewsSentiment/layers/dynamic_rnn.py
diff --git a/...ntiment/layers/point_wise_feed_forward.py → ...ntiment/layers/point_wise_feed_forward.py b/...ntiment/layers/point_wise_feed_forward.py → ...ntiment/layers/point_wise_feed_forward.py
diff --git a/...wsSentiment/layers/pytorchnlpattention.py → NewsSentiment/layers/pytorchnlpattention.py b/...wsSentiment/layers/pytorchnlpattention.py → NewsSentiment/layers/pytorchnlpattention.py
diff --git a/...NewsSentiment/layers/squeeze_embedding.py → NewsSentiment/layers/squeeze_embedding.py b/...NewsSentiment/layers/squeeze_embedding.py → NewsSentiment/layers/squeeze_embedding.py
diff --git a/DeepNewsSentiment/losses/__init__.py → NewsSentiment/losses/__init__.py b/DeepNewsSentiment/losses/__init__.py → NewsSentiment/losses/__init__.py
diff --git a/...ntiment/losses/crossentropycrossweight.py → ...ntiment/losses/crossentropycrossweight.py b/...ntiment/losses/crossentropycrossweight.py → ...ntiment/losses/crossentropycrossweight.py
@@ -2,7 +2,7 @@
 import torch.nn as nn
 
 # CrossEntropyLoss with additional cross weight loss for two targets
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.SentimentClasses import SentimentClasses
 
 
 class CrossEntropyLoss_CrossWeight(nn.Module):

diff --git a/...wsSentiment/losses/crossentropylosslsr.py → NewsSentiment/losses/crossentropylosslsr.py b/...wsSentiment/losses/crossentropylosslsr.py → NewsSentiment/losses/crossentropylosslsr.py
@@ -3,7 +3,7 @@
 import torch.nn as nn
 
 # CrossEntropyLoss for Label Smoothing Regularization
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.SentimentClasses import SentimentClasses
 
 
 class CrossEntropyLoss_LSR(nn.Module):

diff --git a/DeepNewsSentiment/losses/seq2seqloss.py → NewsSentiment/losses/seq2seqloss.py b/DeepNewsSentiment/losses/seq2seqloss.py → NewsSentiment/losses/seq2seqloss.py
@@ -1,7 +1,7 @@
 import torch
 import torch.nn as nn
 
-from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from NewsSentiment.SentimentClasses import SentimentClasses
 
 
 class SequenceLoss(nn.Module):

diff --git a/DeepNewsSentiment/models/FXBaseModel.py → NewsSentiment/models/FXBaseModel.py b/DeepNewsSentiment/models/FXBaseModel.py → NewsSentiment/models/FXBaseModel.py
@@ -8,7 +8,7 @@
 from transformers import XLNetModel, AlbertModel, BertModel, RobertaModel
 from functools import wraps
 
-from DeepNewsSentiment.download import Download
+from NewsSentiment.download import Download
 
 
 class FXBaseModel(nn.Module):

diff --git a/DeepNewsSentiment/models/FXEnsemble.py → NewsSentiment/models/FXEnsemble.py b/DeepNewsSentiment/models/FXEnsemble.py → NewsSentiment/models/FXEnsemble.py
@@ -4,9 +4,9 @@
 import torch.nn as nn
 import torch
 
-from DeepNewsSentiment.consts import *
-from DeepNewsSentiment.dataset import FXDataset
-from DeepNewsSentiment.models.FXBaseModel import FXBaseModel
+from NewsSentiment.consts import *
+from NewsSentiment.dataset import FXDataset
+from NewsSentiment.models.FXBaseModel import FXBaseModel
 
 
 class FXEnsemble(FXBaseModel):

diff --git a/DeepNewsSentiment/models/__init__.py → NewsSentiment/models/__init__.py b/DeepNewsSentiment/models/__init__.py → NewsSentiment/models/__init__.py
diff --git a/DeepNewsSentiment/models/ensemble.py → NewsSentiment/models/ensemble.py b/DeepNewsSentiment/models/ensemble.py → NewsSentiment/models/ensemble.py
@@ -1,11 +1,11 @@
 from argparse import Namespace
 from typing import List, Dict
-from DeepNewsSentiment.consts import *
+from NewsSentiment.consts import *
 import torch.nn as nn
 import torch
 
-from DeepNewsSentiment.models.FXBaseModel import FXBaseModel
-from DeepNewsSentiment.models.singletarget.td_bert import TD_BERT
+from NewsSentiment.models.FXBaseModel import FXBaseModel
+from NewsSentiment.models.singletarget.td_bert import TD_BERT
 
 
 class EnsembleTopA(FXBaseModel):

diff --git a/DeepNewsSentiment/models/ensembleb.py → NewsSentiment/models/ensembleb.py b/DeepNewsSentiment/models/ensembleb.py → NewsSentiment/models/ensembleb.py
@@ -1,11 +1,11 @@
 from argparse import Namespace
 from typing import List, Dict
-from DeepNewsSentiment.consts import *
+from NewsSentiment.consts import *
 import torch.nn as nn
 import torch
 
-from DeepNewsSentiment.models.FXBaseModel import FXBaseModel
-from DeepNewsSentiment.models.singletarget.td_bert import TD_BERT
+from NewsSentiment.models.FXBaseModel import FXBaseModel
+from NewsSentiment.models.singletarget.td_bert import TD_BERT
 
 
 class EnsembleTopB(FXBaseModel):

diff --git a/...Sentiment/models/multitargets/__init__.py → ...Sentiment/models/multitargets/__init__.py b/...Sentiment/models/multitargets/__init__.py → ...Sentiment/models/multitargets/__init__.py