Skip to content

Commit d41bba8

Browse files
committed
Update on "Fix type sharing on loaded ScriptModules"
After save/load, we lose concrete type information. So if you tried to script something that contained a loaded ScriptModule as a submodule, the following sequence happened: 1. During ConcreteType inference, the loaded submodule got a new inferred type. 2. But it already has a type! So there was a type mismatch. To fix this, we should generate a ConcreteType directly from the loaded submodule type (similar to what we do for interfaces). This makes sense too--the ConcreteModuleType should be empty, since all the "sugaredness" was stripped out during the save/load process.
2 parents 79f58ad + 3c21d17 commit d41bba8

File tree

255 files changed

+6013
-3234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+6013
-3234
lines changed

.circleci/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@ Libtorch packages are built in the wheel build scripts: manywheel/build_*.sh for
340340

341341
All linux builds occur in docker images. The docker images are
342342

343-
* soumith/conda-cuda
343+
* pytorch/conda-cuda
344344
* Has ALL CUDA versions installed. The script pytorch/builder/conda/switch_cuda_version.sh sets /usr/local/cuda to a symlink to e.g. /usr/local/cuda-10.0 to enable different CUDA builds
345345
* Also used for cpu builds
346-
* soumith/manylinux-cuda90
347-
* soumith/manylinux-cuda92
348-
* soumith/manylinux-cuda100
346+
* pytorch/manylinux-cuda90
347+
* pytorch/manylinux-cuda92
348+
* pytorch/manylinux-cuda100
349349
* Also used for cpu builds
350350

351351
The Dockerfiles are available in pytorch/builder, but there is no circleci job or script to build these docker images, and they cannot be run locally (unless you have the correct local packages/paths). Only Soumith can build them right now.
@@ -411,7 +411,7 @@ You can build Linux binaries locally easily using docker.
411411

412412
```
413413
# Run the docker
414-
# Use the correct docker image, soumith/conda-cuda used here as an example
414+
# Use the correct docker image, pytorch/conda-cuda used here as an example
415415
#
416416
# -v path/to/foo:path/to/bar makes path/to/foo on your local machine (the
417417
# machine that you're running the command on) accessible to the docker
@@ -426,7 +426,7 @@ docker run \
426426
-v your/pytorch/repo:/pytorch \
427427
-v your/builder/repo:/builder \
428428
-v where/you/want/packages/to/appear:/final_pkgs \
429-
-it soumith/conda-cuda /bin/bash
429+
-it pytorch/conda-cuda /bin/bash
430430
431431
# Export whatever variables are important to you. All variables that you'd
432432
# possibly need are in .circleci/scripts/binary_populate_env.sh

.circleci/cimodel/data/binary_build_definitions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def gen_build_env_parms(self):
2424

2525
def gen_docker_image(self):
2626
if self.gcc_config_variant == 'gcc5.4_cxx11-abi':
27-
return miniutils.quote("soumith/conda-cuda-cxx11-ubuntu1604:latest")
27+
return miniutils.quote("pytorch/conda-cuda-cxx11-ubuntu1604:latest")
2828

2929
docker_word_substitution = {
3030
"manywheel": "manylinux",
@@ -33,10 +33,10 @@ def gen_docker_image(self):
3333

3434
docker_distro_prefix = miniutils.override(self.pydistro, docker_word_substitution)
3535

36-
# The cpu nightlies are built on the soumith/manylinux-cuda100 docker image
36+
# The cpu nightlies are built on the pytorch/manylinux-cuda100 docker image
3737
alt_docker_suffix = self.cuda_version or "100"
3838
docker_distro_suffix = "" if self.pydistro == "conda" else alt_docker_suffix
39-
return miniutils.quote("soumith/" + docker_distro_prefix + "-cuda" + docker_distro_suffix)
39+
return miniutils.quote("pytorch/" + docker_distro_prefix + "-cuda" + docker_distro_suffix)
4040

4141
def get_name_prefix(self):
4242
return "smoke" if self.smoke else "binary"

0 commit comments

Comments
 (0)