Skip to content

Commit 6fcfbad

Browse files
authored
rename ExtractDocString (#2497)
1 parent 285fe09 commit 6fcfbad

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

cmd/sqlflow/main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ LABEL class INTO sqlflow_models.my_model;`
593593
}
594594

595595
func TestInputNavigation(t *testing.T) {
596-
attribute.ExtractDocStringsOnce()
596+
attribute.ExtractSymbolOnce()
597597
a := assert.New(t)
598598
s := newPromptState()
599599
his1 := "history 1"
@@ -625,7 +625,7 @@ func TestInputNavigation(t *testing.T) {
625625
}
626626

627627
func TestComplete(t *testing.T) {
628-
attribute.ExtractDocStringsOnce()
628+
attribute.ExtractSymbolOnce()
629629
a := assert.New(t)
630630
s := newPromptState()
631631
p := prompt.NewBuffer()

doc/design/diag_attribute_error.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ For the implementation, it's easy to extract the check rule and argument documen
9090
``` python
9191
def attribute_check(estimator, **args):
9292
# extract argument name, documentation and contract from doc string
93-
contract = extract_doc_string(estimator)
93+
contract = extract_symbol(estimator)
9494
# SQLFlowDiagnosticError message can be pipe to SQLFlow GUI via SQLFlow gRPC server
9595
diag_err = SQLFLowDiagnosError()
9696
for name, value in args:

pkg/attribute/attribute.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,30 +217,30 @@ func NewDictionaryFromModelDefinition(estimator, prefix string) Dictionary {
217217

218218
// PremadeModelParamsDocs stores parameters and documents of all known models
219219
var PremadeModelParamsDocs map[string]map[string]string
220-
var extractDocStringsOnce sync.Once
220+
var extractSymbolOnce sync.Once
221221

222222
// OptimizerParamsDocs stores parameters and documents of optimizers
223223
var OptimizerParamsDocs map[string]map[string]string
224224

225225
// XGBoostObjectiveDocs stores options for xgboost objective
226226
var XGBoostObjectiveDocs map[string]string
227227

228-
// ExtractDocString extracts parameter documents of Python modules from doc strings
229-
func ExtractDocString(module ...string) {
228+
// ExtractSymbol extracts parameter documents of Python modules from doc strings
229+
func ExtractSymbol(module ...string) {
230230
cmd := exec.Command("python", "-uc", fmt.Sprintf("__import__('symbol_extractor').print_param_doc('%s')", strings.Join(module, "', '")))
231231
output, e := cmd.CombinedOutput()
232232
if e != nil {
233-
log.Println("ExtractDocString failed: ", e, string(output))
233+
log.Println("ExtractSymbol failed: ", e, string(output))
234234
}
235235
// json.Unmarshal extends the map rather than reallocate a new one, see golang.org/pkg/encoding/json/#Unmarshal
236236
if e := json.Unmarshal(output, &PremadeModelParamsDocs); e != nil {
237-
log.Println("ExtractDocString failed:", e, string(output))
237+
log.Println("ExtractSymbol failed:", e, string(output))
238238
}
239239
}
240240

241-
// ExtractDocStringsOnce extracts parameter documents from python doc strings using sync.Once
242-
func ExtractDocStringsOnce() {
243-
extractDocStringsOnce.Do(func() { ExtractDocString("sqlflow_models") })
241+
// ExtractSymbolOnce extracts parameter documents from python doc strings using sync.Once
242+
func ExtractSymbolOnce() {
243+
extractSymbolOnce.Do(func() { ExtractSymbol("sqlflow_models") })
244244
}
245245

246246
func removeUnnecessaryParams() {

pkg/attribute/attribute_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestParamsDocs(t *testing.T) {
4747
a := assert.New(t)
4848

4949
a.Equal(11, len(PremadeModelParamsDocs))
50-
ExtractDocStringsOnce()
50+
ExtractSymbolOnce()
5151
a.Equal(20, len(PremadeModelParamsDocs))
5252
a.Equal(len(PremadeModelParamsDocs["DNNClassifier"]), 12)
5353
a.NotContains(PremadeModelParamsDocs["DNNClassifier"], "feature_columns")

pkg/codegen/tensorflow/codegen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func constructLosses(trainStmt *ir.TrainStmt) {
231231

232232
// InitializeAttributes initializes the attributes of TensorFlow and does type checking for them
233233
func InitializeAttributes(trainStmt *ir.TrainStmt) error {
234-
attribute.ExtractDocStringsOnce()
234+
attribute.ExtractSymbolOnce()
235235
commonAttributes.FillDefaults(trainStmt.Attributes)
236236

237237
modelAttr := attribute.NewDictionaryFromModelDefinition(trainStmt.Estimator, "model.")

0 commit comments

Comments
 (0)