1
0
mirror of https://github.com/newnius/YAO-optimizer.git synced 2025-06-06 22:51:55 +00:00

add files

This commit is contained in:
Newnius 2020-04-30 01:10:20 +08:00
parent 54602b87b8
commit 0560bca8f6
2 changed files with 28 additions and 20 deletions

View File

@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
@ -43,13 +44,13 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="Dockerfile" value="16" />
<entry key="py" value="1303" />
<entry key="py" value="1326" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Dockerfile" value="16" />
<entry key="Python" value="1303" />
<entry key="Python" value="1326" />
</counts>
</usages-collector>
</session>
@ -80,11 +81,11 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/serve.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223">
<caret line="196" column="33" selection-start-line="196" selection-start-column="33" selection-end-line="196" selection-end-column="33" />
<state relative-caret-position="147">
<caret line="74" column="46" lean-forward="true" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
<folding>
<element signature="e#18#46#0" expanded="true" />
<marker date="1588179381860" expanded="true" signature="5469:5743" ph="..." />
<marker date="1588179731968" expanded="true" signature="5391:5665" ph="..." />
</folding>
</state>
</provider>
@ -191,7 +192,7 @@
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588179385586" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588179551169" />
<property name="go.gopath.indexing.explicitly.defined" value="true" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
@ -231,15 +232,16 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1588152877746</updated>
<workItem from="1588152880522" duration="16135000" />
<workItem from="1588152880522" duration="16466000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16135000" />
<option name="totallyTimeSpent" value="16466000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Designer" order="0" />
<window_info id="UI Designer" order="1" />
@ -364,11 +366,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/serve.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223">
<caret line="196" column="33" selection-start-line="196" selection-start-column="33" selection-end-line="196" selection-end-column="33" />
<state relative-caret-position="147">
<caret line="74" column="46" lean-forward="true" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
<folding>
<element signature="e#18#46#0" expanded="true" />
<marker date="1588179381860" expanded="true" signature="5469:5743" ph="..." />
<marker date="1588179731968" expanded="true" signature="5391:5665" ph="..." />
</folding>
</state>
</provider>

View File

@ -72,15 +72,10 @@ class Data:
self.data_num = self.data.shape[0]
self.train_num = int(self.data_num * self.config.train_data_rate)
print(self.data)
self.mean = np.mean(self.data, axis=0)
print(1)
self.std = np.std(self.data, axis=0)
print(self.std)
print(self.mean)
self.norm_data = (self.data - self.mean) / self.std
print(2)
self.start_num_in_test = 0
@ -116,15 +111,26 @@ class Data:
return train_x, valid_x, train_y, valid_y
def get_test_data(self, return_label_data=False):
feature_data = self.norm_data[self.train_num:]
init_data = pd.read_csv(
self.config.train_data_path,
usecols=self.config.feature_and_label_columns
)
data, data_column_name = init_data.values, init_data.columns.tolist()
train_num = 0
mean = np.mean(data, axis=0)
std = np.std(data, axis=0)
norm_data = (data - mean) / std
start_num_in_test = 0
feature_data = norm_data[0:]
self.start_num_in_test = feature_data.shape[0] % self.config.time_step
time_step_size = feature_data.shape[0] // self.config.time_step
test_x = [feature_data[self.start_num_in_test + i * self.config.time_step: self.start_num_in_test + (
test_x = [feature_data[start_num_in_test + i * self.config.time_step: start_num_in_test + (
i + 1) * self.config.time_step]
for i in range(time_step_size)]
if return_label_data:
label_data = self.norm_data[self.train_num + self.start_num_in_test:, self.config.label_in_feature_columns]
label_data = norm_data[train_num + start_num_in_test:, self.config.label_in_feature_columns]
return np.array(test_x), label_data
return np.array(test_x)
@ -191,7 +197,7 @@ class MyHandler(BaseHTTPRequestHandler):
gpu_model = query.get('gpu_model')[0]
time = query.get('time')[0]
data_gainer = Data(config)
test_X, test_Y = np.array([[job, gpu_model, time]]), np.array([[1,1,1]]) #data_gainer.get_test_data(return_label_data=True)
test_X, test_Y = data_gainer.get_test_data(return_label_data=True)
print(test_X, test_Y)
pred_result = predict(config, test_X)
print(pred_result)