make release-tag: Merge branch 'master' into stable

Author: leix28

.gitignore

@@ -2,6 +2,8 @@ data/
 exp-*/
 .remote-sync.json
 .idea/
+scripts/
+*.ipynb
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

BENCHMARK.md

@@ -71,7 +71,7 @@ python -m fibber.benchmark.benchmark \
 	--dataset mr \
 	--strategy ASRSStrategy \
 	--output_dir exp-mr \
-	--num_paraphrases_per_text 20 \
+	--max_paraphrases 20 \
 	--subsample_testset 100 \
 	--gpt2_gpu 0 \
 	--bert_gpu 0 \

HISTORY.md

@@ -1,5 +1,14 @@
 # History
 
+## Version 0.4.0 - 2022-06-29
+This release includes the following updates
+
+## New Features
+- Add RewriteRollbackStrategy, SAPStrategy. 
+- Redesign defense strategy API. 
+- Add AdvTrainStrategy, SEMStrategy, SAPDStrategy
+
+
 ## Version 0.3.1 - 2021-07-20
 This release includes the following updates
 

README.md

@@ -138,7 +138,7 @@ from fibber.fibber import Fibber
 arg_dict = {
     "use_gpu_id": 0,
     "gpt2_gpu_id": 0,
-    "bert_gpu_id": 0,
+    "transformer_clf_gpu_id": 0,
     "ce_gpu_id": 0,
     "strategy_gpu_id": 0,
     "asrs_block_size": 3,
@@ -147,7 +147,7 @@ arg_dict = {
     "asrs_sim_threshold": 0.95,
     "asrs_ppl_weight": 5,
     "asrs_clf_weight": 3
-    "asrs_sim_metric": "CESemanticSimilarityMetric"
+    "asrs_sim_metric": "CESimilarityMetric"
 }
 
 # create a fibber object.
@@ -189,29 +189,29 @@ The output is a tuple of (str, list, list).
 # Evaluation metrics of these 5 paraphrase_list.
 
   {'EditingDistance': 8,
-   'USESemanticSimilarityMetric': 0.9523628950119019,
-   'GloVeSemanticSimilarityMetric': 0.9795315341042675,
-   'GPT2GrammarQualityMetric': 1.492070198059082,
+   'USESimilarityMetric': 0.9523628950119019,
+   'GloVeSimilarityMetric': 0.9795315341042675,
+   'GPT2PerplexityMetric': 1.492070198059082,
    'BertClassifier': 0},
   {'EditingDistance': 9,
-   'USESemanticSimilarityMetric': 0.9372092485427856,
-   'GloVeSemanticSimilarityMetric': 0.9575780832312993,
-   'GPT2GrammarQualityMetric': 0.9813404679298401,
+   'USESimilarityMetric': 0.9372092485427856,
+   'GloVeSimilarityMetric': 0.9575780832312993,
+   'GPT2PerplexityMetric': 0.9813404679298401,
    'BertClassifier': 1},
   {'EditingDistance': 11,
-   'USESemanticSimilarityMetric': 0.9265919327735901,
-   'GloVeSemanticSimilarityMetric': 0.9710499628056698,
-   'GPT2GrammarQualityMetric': 1.325406551361084,
+   'USESimilarityMetric': 0.9265919327735901,
+   'GloVeSimilarityMetric': 0.9710499628056698,
+   'GPT2PerplexityMetric': 1.325406551361084,
    'BertClassifier': 0},
   {'EditingDistance': 7,
-   'USESemanticSimilarityMetric': 0.8913971185684204,
-   'GloVeSemanticSimilarityMetric': 0.9800737898362042,
-   'GPT2GrammarQualityMetric': 1.2504483461380005,
+   'USESimilarityMetric': 0.8913971185684204,
+   'GloVeSimilarityMetric': 0.9800737898362042,
+   'GPT2PerplexityMetric': 1.2504483461380005,
    'BertClassifier': 1},
   {'EditingDistance': 8,
-   'USESemanticSimilarityMetric': 0.9124080538749695,
-   'GloVeSemanticSimilarityMetric': 0.9744155151490856,
-   'GPT2GrammarQualityMetric': 1.1626977920532227,
+   'USESimilarityMetric': 0.9124080538749695,
+   'GloVeSimilarityMetric': 0.9744155151490856,
+   'GPT2PerplexityMetric': 1.1626977920532227,
    'BertClassifier': 0}]
 ```
 

fibber/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = 'MIT Data To AI Lab'
 __email__ = 'dailabmit@gmail.com'
-__version__ = '0.3.1'
+__version__ = '0.4.0.dev0'
 
 import os
 
@@ -18,7 +18,3 @@ def get_root_dir():
 
 # change cache directory
 nltk.data.path += [os.path.join(get_root_dir(), "common", "nltk_data")]
-os.environ['TRANSFORMERS_CACHE'] = os.path.join(
-    get_root_dir(), "common", "transformers_pretrained")
-os.environ['TFHUB_CACHE_DIR'] = os.path.join(get_root_dir(), "common", "tfhub_pretrained")
-os.environ['CORENLP_HOME'] = os.path.join(get_root_dir(), "common", "stanford-corenlp-4.1.0")

fibber/benchmark/__init__.py

@@ -1,3 +1,3 @@
-from fibber.benchmark.benchmark import Benchmark
+from fibber.benchmark.benchmark_adversarial_attack import Benchmark
 
 __all__ = ["Benchmark"]