Merge internal changes into public repository (change 240667526) (#318)

Author: saeta

README.md

@@ -11,3 +11,12 @@ Shell.
 
 _Note:_ This repository is a public mirror, pull requests will not be accepted.
 Please file an issue if you have a feature or bug request.
+
+## Running Models
+
+To run models in the `models` subdirectory, you may need to add the top-level
+`/models` folder to the Python path with the command:
+
+```
+export PYTHONPATH="$PYTHONPATH:/path/to/models"
+```

tools/ctpu/config/config_gcloud.go

@@ -27,12 +27,13 @@ import (
 	"github.com/zieckey/goini"
 )
 
-// TODO(saeta): Add a GCE compatible environment.
-
 const appDefaultFile = "application_default_credentials.json"
 
 func gcloudConfig() (*Config, error) {
 	homedir := ""
+	if configDir, ok := os.LookupEnv("CLOUDSDK_CONFIG"); ok {
+		return buildGcloudEnvConfig(configDir, true)
+	}
 	user, err := user.Current()
 	if err != nil {
 		// Fallback to looking up in the environment as a final attempt.

tools/ctpu/config/config_gcloud_test.go

@@ -16,6 +16,7 @@
 package config
 
 import (
+	"os"
 	"path"
 	"strings"
 	"testing"
@@ -46,6 +47,39 @@ func TestGcloudClean(t *testing.T) {
 	}
 }
 
+func TestGcloudEnvConfigOverride(t *testing.T) {
+	cfgDir := testGcloudConfigDir("clean")
+	originalEnv, originalEnvOk := os.LookupEnv("CLOUDSDK_CONFIG")
+	defer func() {
+		// Attempt to set the original env back.
+		if originalEnvOk {
+			os.Setenv("CLOUDSDK_CONFIG", originalEnv)
+		}
+	}()
+
+	if err := os.Setenv("CLOUDSDK_CONFIG", cfgDir); err != nil {
+		t.Fatalf("Could not set the env: %#v", err)
+	}
+	cfg, err := gcloudConfig()
+
+	if err != nil {
+		t.Fatalf("Error creating config: %v", err)
+	}
+
+	if cfg.ActiveConfiguration != "ctpu9" {
+		t.Error("Active configuration: " + cfg.ActiveConfiguration)
+	}
+	if cfg.account != "[email protected]" {
+		t.Error("Account: " + cfg.account)
+	}
+	if cfg.Project != "ctpu9-test-project" {
+		t.Error("Project: " + cfg.Project)
+	}
+	if cfg.Zone != "us-central1-c" {
+		t.Error("Zone: " + cfg.Zone)
+	}
+}
+
 func TestGcloudCorruptedMissingConfig(t *testing.T) {
 	cfgDir := testGcloudConfigDir("corrupted")
 	_, err := buildGcloudEnvConfig(cfgDir, true)