Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert Experimental Changes #1761

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Revert Experimental Changes #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44fc627
reverting all experimental changes except import paths
Satrat Oct 11, 2023
bba274d
revert bash
Satrat Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/sparseml/experimental/__init__.py
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/sparseml/experimental/sparsegpt/__init__.py
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions src/sparseml/experimental/sparsegpt/dispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

SUPPORTED_MODELS = ["opt", "mpt", "llama"]
SUPPORTED_MODELS = ["opt", "mpt", "llama-2"]


def load_model(args, model_key: str = None, *gargs, **kwargs):
Expand All @@ -21,7 +21,7 @@ def load_model(args, model_key: str = None, *gargs, **kwargs):
from sparseml.experimental.sparsegpt.opt import load_model as _load_model
elif model_key == "mpt":
from sparseml.experimental.sparsegpt.mpt import load_model as _load_model
elif model_key == "llama":
elif model_key == "llama-2":
from sparseml.experimental.sparsegpt.llama2 import load_model as _load_model
else:
raise ValueError(f"Unrecognized model key. Supported: {SUPPORTED_MODELS}")
Expand All @@ -34,7 +34,7 @@ def load_data(args, model_key: str = None, *gargs, **kwargs):
from sparseml.experimental.sparsegpt.opt import load_data as _load_data
elif model_key == "mpt":
from sparseml.experimental.sparsegpt.mpt import load_data as _load_data
elif model_key == "llama":
elif model_key == "llama-2":
from sparseml.experimental.sparsegpt.llama2 import load_data as _load_data
else:
raise ValueError(f"Unrecognized model key. Supported: {SUPPORTED_MODELS}")
Expand All @@ -47,7 +47,7 @@ def evaluate_perplexity(
model_key = _get_model_key(args) if model_key is None else model_key
if model_key == "opt":
from sparseml.experimental.sparsegpt.opt import ppl_eval as _ppl_eval
elif model_key == "llama":
elif model_key == "llama-2":
from sparseml.experimental.sparsegpt.llama2 import ppl_eval as _ppl_eval
else:
raise ValueError(f"Unrecognized model key. Supported: {SUPPORTED_MODELS}")
Expand All @@ -64,7 +64,7 @@ def prepare_sparsegpt(model, dataloader, args, model_key: str = None, **kwargs):
from sparseml.experimental.sparsegpt.mpt import (
prepare_sparsegpt as _prepare_sparsegpt,
)
elif model_key == "llama":
elif model_key == "llama-2":
from sparseml.experimental.sparsegpt.llama2 import (
prepare_sparsegpt as _prepare_sparsegpt,
)
Expand Down
4 changes: 2 additions & 2 deletions src/sparseml/experimental/sparsegpt/examples/llama2/compare_obcq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

dataset = "open_platypus"
model_name = "/home/sadkins/ml-experiments/nlg-text_generation/"
model_name += "llama_chat-llama_7b_chat-base/dense/training"
model_name += "llama_chat-llama_7b_chat-base/dense_llama-2/training"
sparsity = 0.5
nbits = 8
smooth_quant = 0
Expand Down Expand Up @@ -73,7 +73,7 @@ class ProdArgs:


def run_experimental_obcq(experimental_args):
model = load_model(experimental_args)
model, _ = load_model(experimental_args)
calibration_data, _, _ = load_data(experimental_args, data_sequence_length)
sequential(model, calibration_data, device, experimental_args)

Expand Down
2 changes: 1 addition & 1 deletion src/sparseml/experimental/sparsegpt/examples/opt/compare_obcq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ProdArgs:


def run_experimental_obcq(experimental_args):
model = load_model(experimental_args)
model, _ = load_model(experimental_args)
calibration_data, _, _ = load_data(experimental_args, data_sequence_length)
sequential(model, calibration_data, device, experimental_args)

Expand Down
4 changes: 2 additions & 2 deletions src/sparseml/experimental/sparsegpt/examples/opt/scripts/prune_quantize.opt.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

export CUDA_VISIBLE_DEVICES=0

ROOT=$HOME/sparseml/src/sparseml/experimental/sparsegpt
ROOT=$HOME/src/neuralmagic/sparseml/src/sparseml/experimental/sparsegpt

DATASET=c4

RECIPE_DIR=$ROOT/examples/opt/recipes
RECIPE_DIR=$ROOT/recipes
RECIPE_NAME=opt-1.3b-opt_pretrain-pruned50_quantW8A8

SRC_MODEL_ORG=facebook
Expand Down
3 changes: 0 additions & 3 deletions src/sparseml/experimental/sparsegpt/layer_compressor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
from sparseml.experimental.sparsegpt.sparsegpt import SparseGPT


DEFAULT_WBITS = 16


class BaseCompressor:
def __init__(self, model):
self.model = model
Expand Down
Loading
Loading