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.

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

Fix deprecation warning #42

Merged
merged 7 commits into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
add dataset preparation to main train scripts
  • Loading branch information
sdtblck committed Jan 5, 2021
commit f636b2da4c594e837f4f6d02b9455d94545f9fd5
5 changes: 4 additions & 1 deletion configs/base_model.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"data_path": "./data/enwik8.tar.gz",
"dataset": {
"name": "enwik8",
"path": "./data/enwik8.tar.gz"
},
"num_epochs": 10,
"vocab_size": 256,
"batch_size": 4,
Expand Down
12 changes: 0 additions & 12 deletions prepare_dataset.py

This file was deleted.

1 change: 0 additions & 1 deletion scripts/train_enwik8.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
mkdir logs
python3 prepare_dataset.py --model enwik8
NCCL_SHM_DISABLE=1 NCCL_DEBUG=info MASTER_ADDR=127.0.0.1 MASTER_PORT=2000 deepspeed train_enwik8.py --deepspeed --deepspeed_config configs/base_deepspeed.json
1 change: 0 additions & 1 deletion scripts/train_gpt3small.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
mkdir logs
python3 prepare_dataset.py
NCCL_SHM_DISABLE=1 NCCL_DEBUG=info MASTER_ADDR=127.0.0.1 MASTER_PORT=2000 deepspeed train.py --deepspeed --deepspeed_config configs/base_deepspeed.json
8 changes: 7 additions & 1 deletion train.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
dset_params = params["dataset"]
assert dset_params is not None

deepspeed.init_distributed(dist_backend='nccl')
torch.distributed.barrier() # barrier will force processes to stop until *all* processes have reached the barrier
if is_main(train_args):
prepare_data(dset_params["name"])
Expand All @@ -56,7 +57,11 @@
val_loader = iter(val_loader)

# optimizer
optim = torch.optim.Adam(model.parameters(), lr=params["learning_rate"])
if train_args.local_rank == -1: # non-deepspeed
optim = torch.optim.Adam(model.parameters(), lr=params["learning_rate"])
else:
optim = None # deepspeed will prepare the optimizer for us


# training
ds_model_params = prepare_optimizer_parameters(model)
Expand All @@ -68,6 +73,7 @@
model_parameters=ds_model_params,
training_data=train_dataset)

print("OPTIMIZER:", optim)
pbar = trange(params.get("train_steps", 1), mininterval=10., desc='Training Model', dynamic_ncols=True)
for _ in pbar:
for i, data in enumerate(train_loader):
Expand Down
12 changes: 10 additions & 2 deletions train_enwik8.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tqdm.auto import trange

from gpt_neox import (GPTNeoX, AutoregressiveWrapper, TextSamplerDataset, download_dataset,
cycle, prepare_optimizer_parameters, decode_tokens, read_enwik8_data, is_main)
cycle, prepare_optimizer_parameters, decode_tokens, read_enwik8_data, is_main, prepare_data)


def get_args():
Expand Down Expand Up @@ -44,9 +44,17 @@ def get_params(model):
)

model = AutoregressiveWrapper(model)
dset_params = params["dataset"]
deepspeed.init_distributed(dist_backend='nccl')
torch.distributed.barrier() # barrier will force processes to stop until *all* processes have reached the barrier
if is_main(train_args):
prepare_data(dset_params["name"])
torch.distributed.barrier() # barrier will force processes to stop until *all* processes have reached the barrier
else:
torch.distributed.barrier()

# prepare enwik8 data
data_train, data_val = read_enwik8_data(params["data_path"])
data_train, data_val = read_enwik8_data(dset_params["data_path"])
train_dataset = TextSamplerDataset(data_train, params["seq_len"])
val_dataset = TextSamplerDataset(data_val, params["seq_len"])
val_loader = cycle(DataLoader(val_dataset, batch_size=params["batch_size"]))
Expand Down